Commit Graph

93275 Commits

Author SHA1 Message Date
Regis Houssin
d0d9427666 FIX regression 2021-01-02 17:23:25 +01:00
Regis Houssin
3b7f5a92cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 17:20:24 +01:00
Laurent Destailleur
46a5fa52da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:04:35 +01:00
Laurent Destailleur
2d1121031a var not defined 2021-01-02 17:04:08 +01:00
Laurent Destailleur
982f8eb95d Fix syntax error 2021-01-02 17:03:26 +01:00
Laurent Destailleur
150b338764 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:02:08 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
7f0f72ca47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:18 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Aisuko
2d22c1d5d1 Fix wrong cast for pos_change
The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
2021-01-02 15:59:43 +01:00
Laurent Destailleur
2d82c7762f
Merge pull request #15853 from AisukoWasTaken/patch-1
Fix wrong cast for pos_change
2021-01-02 15:59:23 +01:00
Laurent Destailleur
342fed350c
Merge pull request #15855 from frederic34/cleancode
remove unused code
2021-01-02 15:56:45 +01:00
Laurent Destailleur
b30e41771a
Merge pull request #15854 from frederic34/fix_icstransfert
fix migration for icstransfert
2021-01-02 15:54:17 +01:00
Laurent Destailleur
f71c581140
Merge pull request #15856 from aspangaro/13b5
FIX: Accountancy - Debug experimental function to validate movements & typo
2021-01-02 15:53:28 +01:00
Laurent Destailleur
02ae06f24a Fix warning 2021-01-02 15:52:12 +01:00
Laurent Destailleur
f16be78167 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/limits.php
	htdocs/takepos/invoice.php
2021-01-02 15:49:30 +01:00
Laurent Destailleur
d46eb08083 More log and use id to refresh/reload an invoice. 2021-01-02 15:36:19 +01:00
Laurent Destailleur
601d4618d4 Missing vat rates 2021-01-02 14:52:37 +01:00
Laurent Destailleur
a8d15fafd2 Fix missing span 2021-01-02 14:17:54 +01:00
Alexandre SPANGARO
2727fd70b7 FIX: Accountancy - Debug experimental function to validate movements 2021-01-02 14:00:24 +01:00
Laurent Destailleur
791a509c6c Fix warning 2021-01-02 13:26:50 +01:00
Laurent Destailleur
eb3b0ad672 Fix warning 2021-01-02 13:24:06 +01:00
Regis Houssin
e36ae4ac90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 13:14:30 +01:00
Frédéric FRANCE
b71e837ddd
clean code 2021-01-02 10:18:58 +01:00
Frédéric FRANCE
2894dac221
clean code 2021-01-02 10:17:11 +01:00
Frédéric FRANCE
5e692fa9db
doxygen 2021-01-02 09:47:29 +01:00
Frédéric FRANCE
4643e41282
remove unused code 2021-01-02 09:35:57 +01:00
Frédéric FRANCE
8ad9c3dbe9
fix migration for icstransfert 2021-01-02 09:07:16 +01:00
Laurent Destailleur
3cb71ef53e Code comment 2021-01-01 22:55:22 +01:00
Aisuko
0c95540ff0
Fix wrong cast for pos_change
The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
2021-01-01 22:53:01 +01:00
Laurent Destailleur
5cf43a0aab Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 22:05:56 +01:00
Laurent Destailleur
f328bdc3f9 Fix var name 2021-01-01 22:05:12 +01:00
Laurent Destailleur
dbbd5e1abe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 22:00:17 +01:00
Laurent Destailleur
a8cd62c44e Add AUDIT_ENABLE_PREFIX_SESSION 2021-01-01 22:00:00 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
37e9d13982 Fix warning 2021-01-01 21:25:37 +01:00
Laurent Destailleur
0241817217 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 21:12:36 +01:00
Laurent Destailleur
ede38dec30 Fix warning 2021-01-01 21:07:25 +01:00
Laurent Destailleur
715d3499ff Clean code 2021-01-01 21:06:47 +01:00
Laurent Destailleur
7c74a71305 Fix regression 2021-01-01 21:03:44 +01:00
Laurent Destailleur
5c3e543bf9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 20:58:24 +01:00
Laurent Destailleur
48e9c28420 Fix warning 2021-01-01 20:56:34 +01:00
Laurent Destailleur
d11b34c935
Merge pull request #15338 from prietojc/develop_patch-1
NEW: ICS Direct debit per each bank account
2021-01-01 20:53:21 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
Alexandre SPANGARO
bf8b1cec3b Merge branch '13.0' into 13b5 2021-01-01 06:17:33 +01:00
Laurent Destailleur
d2345ea96c Fix warning 2020-12-31 16:55:29 +01:00
Laurent Destailleur
d834f6023d Fix rounding 2020-12-31 16:06:54 +01:00
Laurent Destailleur
3743790160 Fix warning 2020-12-31 15:49:25 +01:00