Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
131,602 Commits 36 Branches 189 Tags
2b5ea3fa7429b217b51ce43d65eb2d78426e12c1
Commit Graph

497 Commits

Author SHA1 Message Date
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Frédéric FRANCE
61600a9e65 code syntax compta directory 2021-02-23 21:09:01 +01:00
Laurent Destailleur
1b129831a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-02-09 14:08:49 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Laurent Destailleur
64b4f1079d Close #15870 manually 2021-01-05 02:23:38 +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
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
71e4a672f5 Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
stickler-ci
327ec211c4 Fixing style errors. 2020-12-31 09:49:27 +00:00
Florian HENRY
f03574d061 bank ok 2020-12-24 14:56:26 +01:00
Laurent Destailleur
c6f83aaed7 Fix warning 2020-12-16 11:21:48 +01:00
JC Prieto
615342aa77 Update account.class.php 
Doc on ics_transfer var
 2020-11-12 10:32:52 +01:00
jcp
50d530733e NEW: ICS fields moved into bank account table 2020-11-09 14:08:34 +01:00
Laurent Destailleur
215ecafb32 Look adn feel v13 2020-11-07 15:54:58 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
ae3228b9e0 retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
cc24e9b155 Look and feel v13 2020-09-15 13:27:48 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
c4383747a1 Look and feel v13 2020-09-11 13:57:16 +02:00
Laurent Destailleur
358f8357f9 FIX #14703 2020-09-10 18:25:38 +02:00
Laurent Destailleur
8b4e153f81 Doc 2020-08-05 20:05:59 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Laurent Destailleur
02e022ebfa Fix class not found for supplier credit. Class must be into 
commoninvoice
 2020-06-24 19:59:06 +02:00
Laurent Destailleur
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
 2020-06-08 20:36:54 +02:00
Laurent Destailleur
c386f4b2e3 Maxi debug of direct debit order 2020-06-08 11:43:20 +02:00
Laurent Destailleur
f66555b396 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:38:46 +02:00
Laurent Destailleur
6881610892 Doxygen 2020-05-27 23:23:01 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec add new rule 2020-05-21 01:52:25 +02:00
Laurent Destailleur
b5f3be4599 Clean phpcs rule file 2020-05-13 00:29:46 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
ee26390f89 Look and feel v12 2020-04-17 19:15:22 +02:00
Scrutinizer Auto-Fixer
387ea73bf3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-13 11:24:42 +00:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
Laurent Destailleur
2e27355dec FIX #13569 2020-04-12 16:51:35 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
f5a07dfb7e Add status into popup 2020-02-28 18:57:17 +01:00
Laurent Destailleur
4f3cc87077 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:00 +01:00
Laurent Destailleur
f3e27695e2 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:50 +01:00
Laurent Destailleur
44ed5980f5 FIX Avoid deletion of bank record if in accounting 2020-02-05 16:35:09 +01:00
Laurent Destailleur
9685b56375 Fix warning 2019-12-15 15:03:22 +01:00
Frédéric FRANCE
269e53583d doxygen 2019-12-11 23:46:12 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
a1f0245c79 clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00