Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,562 Commits 36 Branches 190 Tags
c5f3f428672bbf27ffb51a410b58c03b664fae14
Commit Graph

540 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
fc4a16b356 Fix avoid error when trigger run on downgraded version. 2021-09-30 16:18:07 +02:00
Laurent Destailleur
70d255740b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/class/task.class.php
 2021-09-24 02:33:48 +02:00
Laurent Destailleur
4c80e0425b Fix date for tasks created during project creation 2021-09-24 02:10:42 +02:00
Laurent Destailleur
35e5480f2f Fix var init 2021-09-03 10:58:43 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
14ca7db5d7 Typo in log 2021-09-01 16:17:31 +02:00
Vincent Dieltiens
59e917cd5f regroup BILL_SUPPLIER_VALIDATE actions 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2021-09-01 16:14:44 +02:00
Vincent Dieltiens
65ccbb6249 Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition 2021-09-01 16:06:36 +02:00
Laurent Destailleur
de44dcb691 Fix var init 2021-08-28 18:48:24 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf_other.php
 2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-08-11 21:15:30 +02:00
Marc de Lima Lucio
b610cc1c6c FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object 2021-08-10 11:18:25 +02:00
stickler-ci
1da9829d61 Fixing style errors. 2021-08-03 14:08:23 +00:00
lainwir3d
4873a91afc CLOSE #18326 Workflow: Close order on shipment closing. 
Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
 2021-08-03 17:55:28 +04:00
Laurent Destailleur
957b373ecd Merge pull request #18200 from frederic34/notify 
notify class indent
 2021-08-01 23:27:49 +02:00
Laurent Destailleur
b332d02d20 Merge pull request #18248 from cfoellmann/agenda-fcomm-cancel 
NEW add agenda auto creation on supplier_order cancellation
 2021-07-31 17:02:08 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
047c575d61 Fix some errors on ticket module 2021-07-30 01:42:52 +02:00
Christian Foellmann
b9cb04d4b7 Merge branch 'develop' into agenda-fcomm-cancel 2021-07-29 08:14:02 +02:00
Christian Foellmann
d9529f2600 save makeorder comment to agenda item 2021-07-27 16:37:34 +02:00
Christian Foellmann
faf50a5aaa add agenda auto creation on supplier_order cancellation 2021-07-27 15:06:28 +02:00
Frédéric FRANCE
5e6c942caf notify class indent 2021-07-22 09:22:42 +02:00
Laurent Destailleur
b12aae4a99 FIX amount of payment deleted in unalterable log (for old record must 
look the log of creation to know amount).
 2021-07-13 14:26:32 +02:00
Laurent Destailleur
617338cccd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:50:15 +02:00
Laurent Destailleur
4464aeb639 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-14 14:44:08 +02:00
Laurent Destailleur
6078267f86 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
 2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee Clean code 2021-06-14 14:41:50 +02:00
lvessiller
c37c371392 FIX clone invoice with acount line 2021-06-09 17:18:01 +02:00
Frédéric FRANCE
8401fa3ce7 add trigger member 2021-06-06 17:57:48 +02:00
Frédéric FRANCE
f6bc1c6414 add trigger contact 2021-06-05 09:37:38 +02:00
Laurent Destailleur
0147ffa737 Fix css 2021-06-04 14:38:22 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
6f1c49abcc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
	htdocs/user/class/usergroup.class.php
 2021-06-04 11:04:18 +02:00
Christian Foellmann
68579f9cda fix html linebreak 2021-06-02 08:17:34 +02:00
Christian Foellmann
55d48077a3 ADD note to supplier order refusal 2021-05-31 10:45:34 +02:00
piernov
60176f7f5e Fix add/del user to group modifies LDAP group 
Adding or removing a user from a group modifies the user object on Dolibarr's side.
In LDAP however, members of a group are stored in the group itself.
Therefore group must be updated after adding/removing a user from it.
Update group in LDAP with new list of users at the end of USER_MODIFY trigger.
 2021-05-24 18:01:27 +02:00
Laurent Destailleur
1b25c4daa0 Fix phpcs 2021-05-17 11:29:51 +02:00
Laurent Destailleur
8dc6241aee Clean dead code 2021-05-17 08:58:02 +02:00
Laurent Destailleur
ac95302fa7 Clean comment 2021-05-17 08:48:02 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +02:00
Laurent Destailleur
2f2ba933f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:33:28 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
piernov
1cbe0e3f2d Fix: properly set gid for Group LDAP synchro 
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
 2021-05-15 18:01:34 +02:00
Laurent Destailleur
1d0c0a8d2a Fix phpcs 2021-05-04 00:35:36 +02:00
Laurent Destailleur
16f1651d4e Add missing action events in trigger 2021-05-04 00:04:44 +02:00