Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-26 03:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,518 Commits 36 Branches 191 Tags
0fd2e91ccc127f2a0791e2e9eb57504acba0d025
Commit Graph

2672 Commits

Author SHA1 Message Date
Laurent Destailleur
1957ebcc35 Fix restore warning 2022-05-04 02:13:29 +02:00
Laurent Destailleur
cf38d69733 Merge pull request #20729 from aspangaro/16a26-Accountancy_reconcile 
NEW Accountancy - Add reconcile functionality
 2022-05-01 12:28:51 +02:00
Laurent Destailleur
801f0e62f7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-29 17:37:01 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
 2022-04-29 17:35:36 +02:00
Laurent Destailleur
93de425c47 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
 2022-04-29 17:32:28 +02:00
Laurent Destailleur
f06af016cd Merge pull request #20720 from aspangaro/16a24 
FIX Accountancy - Export format FEC - Prevent tabbing in label with the formats for which it is the separator
 2022-04-29 16:50:51 +02:00
Alexandre SPANGARO
7752c5f122 Comment function 2022-04-28 17:24:10 +02:00
Alexandre SPANGARO
f2d81f97b9 Comment function 2022-04-28 17:10:30 +02:00
stickler-ci
96e247bf89 Fixing style errors. 2022-04-28 13:55:54 +00:00
Alexandre SPANGARO
5cc1aba0f5 Merge branch '16a26-Accountancy_reconcile' of https://github.com/aspangaro/dolibarr into 16a26-Accountancy_reconcile 2022-04-28 15:50:16 +02:00
Alexandre SPANGARO
5379db7c6b Fix stickler-ci 2022-04-28 15:49:08 +02:00
stickler-ci
68864840b6 Fixing style errors. 2022-04-28 13:25:50 +00:00
Alexandre SPANGARO
1efa44a022 NEW Accountancy - Add reconcile functionality 2022-04-28 06:50:37 +02:00
Alexandre SPANGARO
5dce613118 NEW Accountancy - Product admin - Add product categories 2022-04-28 05:34:02 +02:00
Alexandre SPANGARO
3f832c1c5d FIX Accountancy - Export format FEC - Prevent tab in label with the formats for which it is the separator 2022-04-27 04:46:09 +02:00
daraelmin
5387a8e953 FiX miss spelling 2022-04-26 19:07:31 +02:00
stickler-ci
6a1d4c2255 Fixing style errors. 2022-04-25 20:36:34 +00:00
daraelmin
694bcda3bb Fix #20712 - No more empty wrong line added in bookkeeping confirme_create mode 2022-04-25 22:26:25 +02:00
Laurent Destailleur
cb15a21e41 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/originproductline.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/user/card.php
 2022-04-11 21:22:27 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
d0ed15ce5c Typo 2022-04-03 17:12:54 +02:00
Laurent Destailleur
e559ad2aba Optimize column size 2022-04-02 16:50:36 +02:00
Alexandre SPANGARO
141e795de2 NEW Accountancy - Add ref supplier and label on supplier binding page 2022-04-02 05:30:49 +02:00
Laurent Destailleur
63d9f69732 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-03-29 15:55:47 +02:00
Laurent Destailleur
a221b17809 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/compta/facture/class/facture.class.php
 2022-03-29 15:50:25 +02:00
Laurent Destailleur
a415711a66 Fix phpcs 2022-03-29 15:47:54 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
 2022-03-29 15:10:11 +02:00
Laurent Destailleur
007004c2e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/index.php
	htdocs/accountancy/supplier/lines.php
	htdocs/compta/facture/card.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/langs/en_US/errors.lang
 2022-03-29 15:02:29 +02:00
Laurent Destailleur
d1c5c79d22 Merge pull request #20299 from 
Easya-Solutions/13.0_fix-thirdparty-mandatory-fields-on-validate-invoice

FIX check mandatory thirdparty fields for mass action
 2022-03-29 14:53:19 +02:00
Laurent Destailleur
8dd44246b0 Merge pull request #20348 from daraelmin/daraelmin-patch-5 
Fix #20263 Accountancy setup displayed with right
 2022-03-29 14:47:57 +02:00
Alexandre SPANGARO
9db7d29237 Accountancy - Removed old code for reconciled (or lettering...) 2022-03-24 23:14:23 +01:00
Laurent Destailleur
5eb6ddd7b4 Merge 20374 and add some fix. Need to be restested. 2022-03-23 15:32:05 +01:00
lvessiller
566bced9dc FIX escape values and find indexed columns by key 2022-03-18 08:53:54 +01:00
Alexandre SPANGARO
2ef8bd42df Merge remote-tracking branch 'upstream/develop' into 16a3 2022-03-17 14:44:38 +01:00
Alexandre SPANGARO
0856a49ef0 Fix 2022-03-17 14:44:00 +01:00
lvessiller
254ae943e1 FIX conflicts with develop 2022-03-17 12:33:13 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +01:00
Laurent Destailleur
6c210f72dc Fix missing var declaration and constructor 2022-03-16 20:31:40 +01:00
Alexandre SPANGARO
8702918806 Use getDolGlobalIntString() 2022-03-16 16:09:09 +01:00
lvessiller
cbbfe68482 FIX stickler-ci 2022-03-16 11:06:14 +01:00
lvessiller
4ad6cc6a65 FIX stickler-ci 2022-03-16 11:00:14 +01:00
lvessiller
6d6e6ff70c NEW clean values and amount in FEC import 2022-03-16 10:49:16 +01:00
stickler-ci
587b2076d8 Fixing style errors. 2022-03-15 08:11:44 +00:00
Alexandre SPANGARO
5fafa8b642 NEW Accountancy - Add subledger account when we generate a transaction with a deposit invoice 2022-03-15 06:29:26 +01:00
stickler-ci
19be5f662d Fixing style errors. 2022-03-14 08:25:15 +00:00
daraelmin
3eebbc0b14 Fix #20263 Accountancy setup displayed with right 
Fix #20263 Accountancy setup is displayed only for user with rights->accounting->chartofaccount
 2022-03-14 09:24:26 +01:00
Alexandre SPANGARO
87b187bded FIX #20279 Accountancy - PostGreSQL - Error on mass update lines already binded 2022-03-08 03:43:40 +01:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations. 
Fix reponsive
 2022-03-03 09:41:15 +01:00