Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
122,559 Commits 36 Branches 189 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

659 Commits

Author SHA1 Message Date
BB2A Anthony Berton
899598bbb3 Cop 2022-03-12 16:50:48 +01:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
 2022-03-11 17:04:23 +01:00
Laurent Destailleur
11d18fae4a Clean code 2022-03-11 13:36:58 +01:00
BB2A Anthony Berton
e1e573c532 Add Hook 2022-03-09 19:55:40 +01:00
BB2A Anthony Berton
032b8692b1 Add hook 2022-03-09 19:42:17 +01:00
Laurent Destailleur
66f21fc1d0 Fix phpunit 2022-03-07 20:46:09 +01:00
Laurent Destailleur
b1de986fb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-03-07 16:41:44 +01:00
Thomas Negre
b9e0fc7b02 stickler corrections 2022-02-28 19:02:07 +01:00
Thomas Negre
dcc41d0ab7 Ticket triggers: allow to automatically send messages on TICKET_CLOSE event 2022-02-28 17:10:45 +01:00
Thomas Negre
5b1b862687 reformat trigger/interface_50_modTicket_TicketEmail.class.php to create methods for email composition and sending 2022-02-28 17:10:45 +01:00
Thomas Negre
b6b5eb633b only update last_msg_date if a message is really sent. 2022-02-07 17:38:32 +01:00
Thomas Negre
26648e4f12 ticket : update date_last_msg_sent on message sending from backend or public interface 2022-02-07 15:19:13 +01:00
Laurent Destailleur
de30b68f9e Code comment 2022-01-20 17:10:30 +01:00
Laurent Destailleur
4575bbae82 Clean code for browser notifications 2021-12-01 12:00:19 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Laurent Destailleur
c79fa4d3d0 NEW Add workflow action close purchase order on reception validation 
NEW Add workflow action close purchase order on reception closing
 2021-11-19 23:03:12 +01:00
Regis Houssin
415ee6669a FIX missing php8 warning 2021-11-12 17:23:17 +01:00
Regis Houssin
c5d70477c3 FIX compatibility with php8 2021-11-12 16:53:00 +01:00
Regis Houssin
3fb0e3c5ad NEW add html.formldap.class.php 2021-11-03 22:56:15 +01:00
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