Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/fix invoices currency #7

Open
wants to merge 130 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
4109ce0
docker compose done
hglong16 Jun 3, 2022
7e8c56a
fix docker, add staging
hglong16 Jun 9, 2022
71df66a
add test_server
hglong16 Jun 9, 2022
f4d6eaa
show valid date
hglong16 Jun 28, 2022
ec7260b
sua loi chinh ta
hglong16 Jun 29, 2022
265a6c6
sua loi chinh ta 2
hglong16 Jun 29, 2022
c67b8e2
facing bug invoice.xml fail
hglong16 Jun 29, 2022
a965973
fix bug xml
hglong16 Jun 29, 2022
c5ac678
add tmp
svseas Jun 29, 2022
be6ce80
add readme
svseas Jun 29, 2022
aab222d
update README.md
hglong16 Jun 29, 2022
fcf2dfd
fix project instruction
svseas Jun 30, 2022
e9a5d31
Merge branch 'master' of https://github.com/hglong16/merctrans-odoo
svseas Jun 30, 2022
fc154b6
fix project view and default view
svseas Jun 30, 2022
07d0e9d
increment number_id
hglong16 Jun 30, 2022
e8f5706
update gitignore delete tags
hglong16 Jun 30, 2022
e5af8c0
project_id with name of client, create date and no number
hglong16 Jun 30, 2022
6f0a93a
start dev job tree, button job, client_ menu
hglong16 Jul 1, 2022
18cc932
done menu and model merctrans client, need seicurity
hglong16 Jul 1, 2022
ad36910
fix projects
svseas Jul 1, 2022
d279686
fix conflicts
svseas Jul 1, 2022
855524c
fix invoices
svseas Jul 1, 2022
f20e80a
update gitignore
hglong16 Jul 6, 2022
16e2885
add venv 2 gitignore
hglong16 Jul 6, 2022
3164914
Done name and security
hglong16 Jul 6, 2022
6079704
fix job, project database and view
hglong16 Jul 7, 2022
7c12c4d
delete secret
hglong16 Jul 7, 2022
f9316e6
fix bug many2one
hglong16 Jul 8, 2022
6c9ded0
Update README.md
hglong16 Jul 13, 2022
b17db7d
Closes #3
svseas Jul 13, 2022
e1c6f33
Merge branch 'develop' of https://github.com/hglong16/merctrans-odoo
hglong16 Jul 13, 2022
e1b1566
Fix default currencies
svseas Jul 13, 2022
e14da0d
some changes
svseas Jul 13, 2022
97e6ed6
fix currencies
svseas Jul 13, 2022
52fde86
add clients
svseas Jul 13, 2022
af3de1e
fix create in project view, fix order in project, fix client country
svseas Jul 14, 2022
081730d
job in project, bug has some but
hglong16 Jul 14, 2022
fc71982
Merge branch 'master' of https://github.com/hglong16/merctrans-odoo
svseas Jul 13, 2022
6b53ff0
fix client project
svseas Jul 14, 2022
4862bc0
fix client project
svseas Jul 14, 2022
230e837
fix project menu
svseas Jul 14, 2022
1e7dc12
add client history and client invoice history
svseas Jul 14, 2022
6bfb44e
start docker auto update module
hglong16 Jul 14, 2022
cc41957
job_value -> project_value DONE
hglong16 Jul 14, 2022
86f6f24
delete wrong file
hglong16 Jul 14, 2022
f666387
rename file
hglong16 Jul 14, 2022
8157d77
jobs >> po, pos, purchase order
hglong16 Jul 14, 2022
1cef357
change layout of pos
hglong16 Jul 14, 2022
fa1a82c
fix menu project
svseas Jul 14, 2022
64a8a44
add client project history and invoice history
svseas Jul 14, 2022
ddd95d7
add margin to project, fix required fields in projects, fix display f…
svseas Jul 14, 2022
2f3b3f2
add blank line
hglong16 Jul 15, 2022
cb483b9
updated readme bash and postgres
hglong16 Jul 20, 2022
8e0be55
add service pgadmin4
hglong16 Jul 20, 2022
59be719
PO ID Done
hglong16 Jul 21, 2022
c6fbe58
default date
hglong16 Jul 21, 2022
75dfbb6
fix view
svseas Jul 21, 2022
57d210b
change required, name some fields in pos
hglong16 Jul 22, 2022
3aa2457
invoice id done
hglong16 Jul 22, 2022
16b4e22
fix bug po in pos
hglong16 Jul 22, 2022
bf6479c
merge commit client cannot create
hglong16 Jul 22, 2022
a28f4c8
fix bug, domain err >> variables in domain need defined
hglong16 Jul 22, 2022
fa068b6
form PO cant create
hglong16 Jul 22, 2022
35620fb
missing self keyword in defaul due_date in pos.py
hglong16 Jul 22, 2022
41e2c3d
facing bug default due_date
hglong16 Jul 22, 2022
3f5189e
turn off create in tree view
hglong16 Jul 22, 2022
eede134
add 3 digit ids
hglong16 Jul 22, 2022
4a611e7
fix client fields
svseas Jul 26, 2022
0437010
add xlwt package and bring odoo Dockerfile to local
hglong16 Jul 26, 2022
3297852
No need sudo install xlwt
hglong16 Jul 26, 2022
5e87fe2
model contributors done
hglong16 Jul 26, 2022
e8a915b
fix menu
svseas Jul 26, 2022
604a02d
change contributor -> res.users and add total po field
svseas Jul 26, 2022
744eee7
total po in tree view
svseas Jul 26, 2022
f4d4be8
update gitignore tren may anh truong
svseas Jul 26, 2022
06bb2ce
change contributor res.partner -> res.users
hglong16 Jul 26, 2022
7b6c65c
hoanglong pro vcl -> new images odoo
hglong16 Jul 26, 2022
055c9e4
sua loi cua anh Truong integer != Char
hglong16 Jul 26, 2022
eef5e02
clean docker
hglong16 Jul 27, 2022
37a21c0
fix things
svseas Jul 27, 2022
e282ab2
open ports 8070 8071
svseas Jul 27, 2022
349e686
nginx done
hglong16 Jul 27, 2022
b0e9e25
fix clients, fix client view, change client to account, add contact t…
svseas Jul 27, 2022
f2aaec1
fix conflicts
svseas Jul 27, 2022
260d20b
Merge branch 'truong-develop' of https://github.com/hglong16/merctran…
hglong16 Jul 27, 2022
0a9197f
fix contact email constrains
svseas Jul 27, 2022
14255bf
Merge branch 'truong-develop'
svseas Jul 27, 2022
244e6cf
delete Dockerfile-odoo
hglong16 Jul 27, 2022
f9105eb
delele conflic and modify odoo.conf
hglong16 Jul 27, 2022
0e0a3de
accept conflic
hglong16 Jul 27, 2022
f7b723b
fix conflict
hglong16 Jul 27, 2022
caa89df
fix conflict contributors.xml
hglong16 Jul 27, 2022
d725664
add seicurity for account.contacts
hglong16 Jul 27, 2022
b44cea9
change Account Contacts to Contacts
svseas Jul 27, 2022
7014039
add xmlrpc port 8069, fix bug polling
hglong16 Jul 27, 2022
6989322
fix source and target languages in projects and pos
svseas Jul 27, 2022
ec58eaa
delete some view xml thua thai
hglong16 Jul 27, 2022
449e3c6
Merge branch '20222707-truong-develop'
hglong16 Jul 27, 2022
a7c41a4
fix longpolling, by edit config nginx
hglong16 Jul 27, 2022
2e92a6f
increase timeout
hglong16 Jul 27, 2022
146b422
add fields to clients, change client view, and fix email bug
svseas Aug 6, 2022
69a989b
fix clients
svseas Aug 8, 2022
ace8a08
fix conflic in origin
hglong16 Aug 10, 2022
131830c
fix invoice
svseas Aug 18, 2022
6e4e54b
Merge pull request #4 from hglong16/0808-truong
hglong16 Aug 18, 2022
c8e197e
fix a typo so commit to master
svseas Aug 18, 2022
7dd9b59
fix invoices, add more fields, validation for fields
svseas Aug 23, 2022
ef4dabf
fix percentage in discount fields
svseas Aug 25, 2022
e698d5b
fix invoices and invoice view
svseas Aug 26, 2022
ba4bf7b
sale order created
svseas Sep 20, 2022
24b0446
fix invoice
svseas Oct 7, 2022
54d4a04
create sale order
svseas Oct 7, 2022
d742488
fix sale order-auto populate
svseas Oct 7, 2022
3bc96db
fix sale module
svseas Oct 9, 2022
5ad89c2
fix status sync and on delete change
svseas Oct 9, 2022
af0fa27
fix sale order status sync
svseas Oct 9, 2022
0c54ba9
fix menu display
svseas Oct 10, 2022
fcfedfa
fix sale and invoices
svseas Oct 10, 2022
f27ede7
Merge pull request #5 from hglong16/feature/saleorder
svseas Oct 11, 2022
9b9360e
add ir.model and fix 'comput'->'compute'
yoose-joetang Oct 12, 2022
ff640ef
add tags ir.models.access
yoose-joetang Oct 12, 2022
71c1343
Merge pull request #6 from hglong16/feature/sale_seicu
hglong16 Oct 12, 2022
6a8a455
fix sync status bug
svseas Oct 22, 2022
5046f64
Merge branch 'svseas:master' into master
svseas Oct 23, 2022
1905261
fix bugs in projects, invoices, sale
svseas Oct 23, 2022
21e9e34
cron job for sync status
svseas Oct 23, 2022
0a2ae8f
fix invoices
svseas Oct 24, 2022
a38cc0b
fix invoice currency
svseas Oct 25, 2022
eb19abc
fix PO
svseas Oct 26, 2022
39c3590
fix po readonly
svseas Oct 27, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
*/__pycache__/
__pycache__
*.pyc
odoo/
.idea
docker-compose.yml
tags
venv
*.swp
Dockerfile
local-addons/merctrans_projects/__pycache__
local-addons/merctrans_projects/controllers/__pycache__
local-addons/merctrans_projects/models/__pycache__
odoo
tags
11 changes: 11 additions & 0 deletions Dockerfile-nginx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM nginx:latest
MAINTAINER Ozrlz

# Conf files
COPY odoo-nginx_ssl.conf /etc/nginx/conf.d/

# Delete default files
RUN rm /etc/nginx/conf.d/default.conf

# Expose 8069 port, in which the users will interact with odoo services
EXPOSE 8069
10 changes: 10 additions & 0 deletions Dockerfile-odoo
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM hglong16/odoo:latest

USER root


RUN pip3 install psycogreen zeep pstats_print2list simplejson plaid-python xlrd phonenumbers pyOpenSSL asn1crypto bcrypt boto3 botocore certifi cffi chardet cryptography docutils dropbox gevent greenlet idna jmespath paramiko pyasn1 pycparser pynacl pyocclient pysftp requests s3transfer urllib3 num2words pyldap qrcode vobject watchdog xlwt firebase-admin odoo_import_export_client

USER odoo

EXPOSE 8072
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Merctrans Project Manager
- debug docker odoo
``` bash
docker exec -it 02_merctrans_odoo-web_prod-1 bash -c "odoo shell -d merctrans"
```
- docker exec -it 02_merctrans_odoo-web_prod-1 bash -c "odoo shell -d merctrans"
- Connect Postgres in docker
``` bash
# name_service_db = 02_merctrans_odoo-db-1
docker exec -it 02_merctrans_odoo-db-1 bash
# Sau khi connect duoc vao bash cua odoo service
psql -U odoo postgres
```

connect pgadmin4 - port 5433
**Create new server**
hostname/address : db
username: odoo
password: odoo
60 changes: 60 additions & 0 deletions config-test/odoo.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
[options]
addons_path = /usr/lib/python3/dist-packages/odoo/addons,/mnt/extra-addons
admin_passwd = $pbkdf2-sha512$25000$PGcsJUQoBQBAaK01xhhDiA$/NTAxCw1WKf.AhwdY8GSeD.g661WlpE0egA6Xn7wPaHISvuNqzPAia5ltfU29FMsWNXOPo29vGMgH6bw3G9fBA
csv_internal_sep = ,
data_dir = /var/lib/odoo/.local/share/Odoo
db_host = db_test
db_maxconn = 64
db_name = merctrans_test
db_password = odoo
db_port = 5432
db_sslmode = prefer
db_template = template0
db_user = odoo
dbfilter =
demo = {}
email_from = [email protected]
geoip_database = /usr/share/GeoIP/GeoLite2-City.mmdb
http_enable = True
http_interface =
http_port = 8069
import_partial =
limit_memory_hard = 2684354560
limit_memory_soft = 2147483648
limit_request = 8192
limit_time_cpu = 60
limit_time_real = 120
limit_time_real_cron = -1
list_db = False
log_db = False
log_db_level = warning
log_handler = :INFO
log_level = info
logfile =
longpolling_port = 8072
max_cron_threads = 2
osv_memory_age_limit = False
osv_memory_count_limit = False
pg_path =
pidfile =
proxy_mode = False
reportgz = False
screencasts =
screenshots = /tmp/odoo_tests
server_wide_modules = base,web
smtp_password = False
smtp_port = 25
smtp_server = localhost
smtp_ssl = False
smtp_user = False
syslog = False
test_enable = False
test_file =
test_tags = None
transient_age_limit = 1.0
translate_modules = ['all']
unaccent = False
upgrade_path =
without_demo = True
workers = 0

35 changes: 35 additions & 0 deletions config/odoo.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[options]
addons_path = /usr/lib/python3/dist-packages/odoo/addons,/mnt/extra-addons
admin_passwd = $pbkdf2-sha512$25000$PGcsJUQoBQBAaK01xhhDiA$/NTAxCw1WKf.AhwdY8GSeD.g661WlpE0egA6Xn7wPaHISvuNqzPAia5ltfU29FMsWNXOPo29vGMgH6bw3G9fBA
csv_internal_sep = ,
data_dir = /var/lib/odoo/.local/share/Odoo
db_host = db
db_maxconn = 64
db_name = merctrans
db_password = odoo
db_port = 5432
db_sslmode = prefer
db_template = template0
db_user = odoo
http_enable = True
http_interface =
http_port = 8069
import_partial =
limit_memory_hard = 2684354560
limit_memory_soft = 2147483648
limit_request = 8192
limit_time_cpu = 3600
limit_time_real = 3600
max_cron_threads = 2
workers = 6
longpolling_port = 8072
server_wide_modules = base,web
translate_modules = ['all']
list_db = True
dbfilter = .*
xmlrpc = True
xmlrpc_port = 8069
xmlrpcs = True
xmlrpc_interface =
netrpc_interface =
proxy_mode = True
55 changes: 55 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
version: "3.1"
services:
web:
container_name: odoo_web
image: hglong16/odoo:latest
depends_on:
- db
volumes:
- odoo-web-data:/var/lib/odoo
- ./config:/etc/odoo
- ./local-addons:/mnt/extra-addons
environment:
- USER=odoo
- PASSWORD=odoo
ports:
- "8069:8069"
- "8072:8072"
networks:
- postgres
command: >
-u merctrans_projects
db:
image: postgres:13
environment:
- POSTGRES_DB=postgres
- POSTGRES_PASSWORD=odoo
- POSTGRES_USER=odoo
- PGDATA=/var/lib/postgresql/data/pgdata
volumes:
- odoo-db-data:/var/lib/postgresql/data/pgdata
networks:
- postgres
pgadmin:
container_name: pgadmin_container
image: dpage/pgadmin4
environment:
PGADMIN_DEFAULT_EMAIL: [email protected]
PGADMIN_DEFAULT_PASSWORD: admin
PGADMIN_CONFIG_SERVER_MODE: 'False'
volumes:
- pgadmin:/var/lib/pgadmin
ports:
- 5433:80
networks:
- postgres
restart: unless-stopped

networks:
postgres:
driver: bridge

volumes:
odoo-web-data:
odoo-db-data:
pgadmin:
Empty file modified local-addons/merctrans_projects/__init__.py
100644 → 100755
Empty file.
11 changes: 8 additions & 3 deletions local-addons/merctrans_projects/__manifest__.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
'0.1',

# any module necessary for this one to work correctly
'depends': ['base', 'sale'],
'depends': ['base'],

# always loaded
'data': [
Expand All @@ -34,10 +34,15 @@
'security/security_rules.xml',
'security/ir.model.access.csv',
# View <>
'views/pos.xml',
'views/contributors.xml',
'views/projects_menus.xml',
'views/clients.xml',
'views/templates.xml',
# 'views/sale.xml',
'views/jobs.xml'
'views/sale.xml',
'data/automation.xml',
#data
'data/currencies.xml'
],
# only loaded in demonstration mode
'demo': [
Expand Down
Binary file not shown.
Binary file not shown.
Empty file modified local-addons/merctrans_projects/controllers/__init__.py
100644 → 100755
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file modified local-addons/merctrans_projects/controllers/controllers.py
100644 → 100755
Empty file.
16 changes: 16 additions & 0 deletions local-addons/merctrans_projects/data/automation.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo>
<data noupdate="0">
<record id="ir_cron_scheduler_sync_status_action" model="ir.cron">
<field name="name">Auto Sync Payment Status</field>
<field name="model_id" ref="model_merctrans_projects"/>
<!-- <field name="type">ir.actions.server</field>-->
<field name="state">code</field>
<field name="code">model.auto_sync_status()</field>
<field name="user_id" ref="base.user_root"/>
<field name="interval_number">1</field>
<field name="interval_type">minutes</field>
<field name="numbercall">-1</field>
</record>
</data>
</odoo>
34 changes: 34 additions & 0 deletions local-addons/merctrans_projects/data/currencies.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
<!-- Currencies -->
<!-- Add currencies.xml to data to override base currency -->
<record id="base.USD" model="res.currency">
<field name="name">USD</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="active" eval="True"/>
<field name="position">before</field>
<field name="currency_unit_label">Dollars</field>
<field name="currency_subunit_label">Cents</field>
</record>

<record id="base.EUR" model="res.currency">
<field name="name">EUR</field>
<field name="symbol">€</field>
<field name="rounding">0.01</field>
<field name="active" eval="True"/>
<field name="currency_unit_label">Euros</field>
<field name="currency_subunit_label">Cents</field>
</record>

<record id="base.VND" model="res.currency">
<field name="name">VND</field>
<field name="symbol">₫</field>
<field name="rounding">1.00</field>
<field name="active" eval="True"/>
<field name="currency_unit_label">Dong</field>
<field name="currency_subunit_label">Xu</field>
</record>
</data>
</odoo>
Empty file modified local-addons/merctrans_projects/demo/demo.xml
100644 → 100755
Empty file.
3 changes: 1 addition & 2 deletions local-addons/merctrans_projects/models/__init__.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-

from . import merctrans_projects
# from . import merctrans_sales
from . import merctrans_jobs
from . import merctrans_clients, merctrans_pos, merctrans_projects, merctrans_invoices, merctrans_contributors, merctrans_sale
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading