Laurent Destailleur
4c8043bd9f
Merge pull request #15598 from dolibit-ut/patch-52
...
Update llx_const.sql
2020-12-02 19:17:31 +01:00
Laurent Destailleur
37b6a15dbb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-02 19:13:44 +01:00
Laurent Destailleur
d88173d7ba
Fix bad column
2020-12-02 19:13:32 +01:00
Laurent Destailleur
9d2a78003e
Merge pull request #15606 from Zebedeu/develop
...
New add VAT RAT for Angola
2020-12-02 18:34:32 +01:00
Laurent Destailleur
38b67b0de6
Merge pull request #15616 from dolibit-ut/patch-54
...
Update llx_accounting_account_ca.sql
2020-12-02 18:31:58 +01:00
Laurent Destailleur
409b73fe2c
FIX #15582
2020-12-02 15:16:04 +01:00
Marcio Zebedeu
561c7438bc
New Add Angola City name
...
Angola province/city support added
2020-12-02 12:36:15 +01:00
Marcio Zebedeu
73edd081dd
New Support for Angolan currency added
...
Support for Region Angola added
2020-12-02 12:04:35 +01:00
UT from dolibit
8944670c03
Update llx_accounting_account_ca.sql
...
subtype_pcg removed
2020-12-02 08:28:16 +01:00
Marcio Zebedeu
f7a8a02b98
Update llx_c_tva.sql
2020-12-01 20:07:58 +01:00
Marcio Zebedeu
de9a32972f
New currency for Angolan added
...
Support for Angolan currency added
2020-12-01 19:48:49 +01:00
Marcio Zebedeu
ea1393a7cb
New add VAT RAT for Angola
...
VAT rate support for Angola was added.
2020-12-01 19:29:11 +01:00
UT from dolibit
9d1da25f03
Update llx_const.sql
2020-12-01 13:57:33 +01:00
Laurent Destailleur
7634212811
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
6a8ddacb33
Prepare database to allow to disconnect other session after a password
...
change
2020-11-29 21:01:57 +01:00
Laurent Destailleur
de98ef1718
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2020-11-29 20:57:43 +01:00
Laurent Destailleur
d45fe6c17f
FIx #15551
2020-11-29 20:39:39 +01:00
Laurent Destailleur
fab9b3d50c
Fix warning
2020-11-28 18:34:13 +01:00
Laurent Destailleur
e1a6e8f2fc
CSS
...
Security: Add param to fight against Clickjacking attacks
2020-11-26 11:29:16 +01:00
Laurent Destailleur
d8bf7b2714
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
2020-11-25 18:04:06 +01:00
Laurent Destailleur
ac859bc38e
Merge pull request #15531 from FHenry/develop
...
Fix bank transfert supplier
2020-11-25 13:06:10 +01:00
Florian HENRY
e2b96a834d
add SCOP and SCIC in ent form juridique
2020-11-25 12:11:00 +01:00
Florian HENRY
12ef03f06d
fix banck tranfert supplier
2020-11-25 10:58:34 +01:00
Jean-Sébastien Pédron
9b1dbf8d2a
llx_accounting_account_fr.sql: Remove left over field data
...
In commit 86d9622360 , the `pcg_subtype`
was removed from the inserted values.
In commit a85dfaf71e , values associated
with this field were removed. However, at least two lines in the
PCG99-BASE accounting accounts still had that field values.
This led to errors when importing the PCG99-BASE accounts. This patch
fixes the problem and the accounts can be imported successfully.
2020-11-24 22:19:21 +01:00
Laurent Destailleur
47cfdb4ef2
Prepare database to be ready for a future fix on sessions
2020-11-24 11:38:05 +01:00
Laurent Destailleur
9004be1df2
Debug feature to send remind by email
2020-11-21 17:42:07 +01:00
Laurent Destailleur
32ae1bf350
Sync transifex
2020-11-18 15:56:06 +01:00
UT from dolibit
1f8a8459fa
Update llx_c_currencies.sql
2020-11-13 11:25:58 +01:00
Laurent Destailleur
b71cd0edea
Merge pull request #15378 from orebd/debug_ticket
...
Fix some tickets issue
2020-11-13 09:58:57 +01:00
Laurent Destailleur
6d4d3c618d
FIX #15369 and standardize permission "readall"
2020-11-13 09:55:53 +01:00
Aurélien
d9d32524f7
Fix #14460
2020-11-13 00:36:25 +01:00
Laurent Destailleur
7be3a2267e
Add missing vat rates
2020-11-12 22:23:21 +01:00
Laurent Destailleur
42ea51be49
Fix migration
2020-11-11 07:43:45 +01:00
Laurent Destailleur
529d7ca9cb
Merge pull request #15305 from fappels/13_fix_reception_update
...
Fix sql error reception update, tms is auto timestamp
2020-11-05 19:22:55 +01:00
Regis Houssin
6348a64369
FIX missing rename file date_m to tms
2020-11-05 18:45:30 +01:00
Francis Appels
1ca0083eb8
Fix sql error reception update, tms is auto timestamp
...
remove deprecated
2020-11-05 14:30:30 +01:00
Laurent Destailleur
c399721345
Update doc
2020-11-05 09:16:51 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
49ccf2a3cb
Update doc
2020-11-01 15:55:51 +01:00
Laurent Destailleur
19b82047f0
Fix sql
2020-10-27 10:00:35 +01:00
Laurent Destailleur
07729ec431
Merge pull request #15150 from FHenry/dev_fix_migration_livraison_to_delivery
...
fix migration livraison to delivery
2020-10-26 19:28:59 +01:00
Laurent Destailleur
0abce469e9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-26 19:09:08 +01:00
Laurent Destailleur
f18a13b2d4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/product/class/productcustomerprice.class.php
2020-10-26 19:08:11 +01:00
Laurent Destailleur
3ee618d736
FIX Clean orphan records in llx_ecm_files into repair script.
2020-10-26 18:31:12 +01:00
Florian HENRY
949be12e19
fix migration livraison to delivery
2020-10-25 17:26:15 +01:00
Laurent Destailleur
8578a7cd7c
Fix regressions
2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56
Merge branch 'translateModLivraison2ModDelivery' of
...
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Drosis Nikos
6ea9befb48
Add & Update tva for Greece
2020-10-16 15:20:12 +03:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType
...
NEW : Nature of product is now a dictionay
2020-10-15 21:07:42 +02:00
Laurent Destailleur
a1913995df
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_services_contracts.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/expensereport/class/expensereport.class.php
2020-10-15 21:05:00 +02:00