lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,203 Commits 43 Branches 150 Tags 886 MiB
fd2bfc82f2
Commit Graph

102203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fd2bfc82f2 Fix #18581 Fix #18582 2021-09-02 17:20:14 +02:00
Laurent Destailleur
cd313d7506 Save type (manufacture/disassemble) on MO. 2021-09-02 15:23:31 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
cac1a7ba5f Fix sql request when using encrypt 2021-09-02 13:45:44 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
8193e792b5 Fix responsive 2021-09-01 22:39:01 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:37:15 +02:00
Laurent Destailleur
1bce356efa Fix responsive 2021-09-01 21:34:59 +02:00
Laurent Destailleur
c207dde5e1 Fix cancel button 2021-09-01 20:10:56 +02:00
Laurent Destailleur
c38161374d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 19:46:03 +02:00
Laurent Destailleur
207328c872 Example to fix the #18448 2021-09-01 19:45:46 +02:00
Laurent Destailleur
28aa57b169
Merge pull request #18497 from FHenry/dev_new_projtask_changefilterdate 
NEW: date filter on project list and task list From->To
 2021-09-01 19:19:08 +02:00
Laurent Destailleur
03cfea2504 Fix const setup 2021-09-01 19:06:58 +02:00
Laurent Destailleur
eaf1379751 Trans 2021-09-01 18:55:27 +02:00
Laurent Destailleur
a7b0a837d4 Fix cancel button must be named "$cancel" everywhere. 2021-09-01 18:46:06 +02:00
Laurent Destailleur
7c7e89cc3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-09-01 18:41:44 +02:00
Laurent Destailleur
270eede593 Removed $_GET and $_REQUEST 2021-09-01 18:39:35 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2 
Undef vars2
 2021-09-01 18:36:26 +02:00
Laurent Destailleur
7e567d5fd2
Update list.php 2021-09-01 18:36:00 +02:00
Laurent Destailleur
cc1ec0aad9
Update list.php 2021-09-01 18:35:19 +02:00
Laurent Destailleur
831a66465f Fix trans 2021-09-01 18:28:21 +02:00
Christian Foellmann
f391b11da7 fix product nature on create 2021-09-01 18:23:38 +02:00
Laurent Destailleur
7c429bca0d
Merge pull request #18533 from cfoellmann/PR/fix-nature 
fix product nature on create
 2021-09-01 18:20:52 +02:00
Laurent Destailleur
82d99bfa01
Merge pull request #18546 from lainwir3d/fix_restapi_order_mail_substitutes 
FIX #18544 Shipment rest api: load thirdparty object when validating
 2021-09-01 18:19:11 +02:00
Laurent Destailleur
f0a68d728a
Merge pull request #18548 from henrynopo/patch-17 
Fix error of SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED
 2021-09-01 18:17:37 +02:00
Laurent Destailleur
c4acfe5fc0
Merge pull request #18577 from Givriz/dev_2 
Compatibility phpv8
 2021-09-01 18:06:06 +02:00
Laurent Destailleur
7e8ce82e0a
Merge pull request #18543 from lainwir3d/fix_restapi_global_user_variable 
FIX #18542 REST API: set global $user variable to DolibarrApiAccess::user
 2021-09-01 18:05:40 +02:00
Laurent Destailleur
0f325bdd65
Update api_access.class.php 2021-09-01 18:05:24 +02:00
Laurent Destailleur
82d878dd7a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-09-01 17:59:07 +02:00
Laurent Destailleur
79a25248cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2021-09-01 17:55:32 +02:00
Laurent Destailleur
74f3b98ea9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2021-09-01 17:54:21 +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
3e4d7dfaba Fix $_SERVER["PHP_SEFL"] into $_SERVER["PHP_SELF"] 2021-09-01 17:44:54 +02:00
stickler-ci
1457afb9b9 Fixing style errors. 2021-09-01 15:35:23 +00:00
Laurent Destailleur
60e4e23870
Update object_discounts.tpl.php 2021-09-01 17:33:18 +02:00
Laurent Destailleur
7c5621a2d4
Merge pull request #18552 from aspangaro/15a12 
NEW Invoice list - Use complete country select field with EEC or not
 2021-09-01 17:17:48 +02:00
Laurent Destailleur
443827ff42 FIX #18531 2021-09-01 17:10:26 +02:00
Laurent Destailleur
65c92f176c
Merge pull request #18553 from Hystepik/develop#1 
Fix : KnowledgeManagement menu permission
 2021-09-01 16:43:01 +02:00
Givriz
688d217bed Compatibility phpv8 2021-09-01 16:39:28 +02:00
Laurent Destailleur
8dd4dae8f8
Merge pull request #18558 from FHenry/dev_more_inv_task_comment 
From #18530 display date and duration in invoice generation from task time spent
 2021-09-01 16:27:24 +02:00
Laurent Destailleur
b66bd781a4 Clean code 2021-09-01 16:26:59 +02:00
Vincent Dieltiens
2bad48bdcc FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-09-01 16:25:29 +02:00
Laurent Destailleur
4ba189fffb
Merge pull request #18560 from vincentjdc/supplier-order-dispatch-common-object-line 
FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject
 2021-09-01 16:23:28 +02:00
Laurent Destailleur
1027f1059e
Merge pull request #18574 from FHenry/14_eventorg 
fix: disabled module Event Org when project disabled
 2021-09-01 16:17:55 +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
46a38506a5
Merge pull request #18562 from vincentjdc/bill-supplier-validate 
Bill supplier validate
 2021-09-01 16:04:50 +02:00
Damien BENOIT
2d5be77561
Merge pull request #34 from Dolibarr/develop 
Update fork
 2021-09-01 15:40:30 +02:00