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

7668 Commits

Author SHA1 Message Date
Marc de Lima Lucio
cfc78a17f7 FIX: deposit payment terms: bad test for already existing deposit 2021-10-04 18:21:28 +02:00
Marc de Lima Lucio
1b2494855d NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI 2021-10-04 18:09:24 +02:00
Marc de Lima Lucio
087157890e FIX: deposit payment terms: unused variable 2021-10-04 15:06:52 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
157112758b Fix phpcs 2021-09-30 20:14:59 +02: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
stickler-ci
f6b9336a82 Fixing style errors. 2021-09-30 10:59:29 +00:00
Marc de Lima Lucio
d74776622d NEW: deposit payment terms: check invoice module activation + rights 2021-09-30 12:57:00 +02:00
stickler-ci
e1c5d01361 Fixing style errors. 2021-09-30 10:43:40 +00:00
Marc de Lima Lucio
81ddc6c0f6 NEW: deposit payment terms: generate deposit from proposal 2021-09-30 12:41:07 +02:00
Marc de Lima Lucio
b0aa502ed4 NEW: deposit payment terms: set deposit percentage in proposals/orders + get from origin document or company 2021-09-29 14:51:30 +02:00
Marc de Lima Lucio
4d6c1d892b NEW: deposit payment terms: set deposit percentage in company card 2021-09-29 14:03:35 +02:00
Marc de Lima Lucio
004b52f590 NEW: deposit payment terms: add field into CRUD methods 2021-09-29 12:05:38 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Alexandre SPANGARO
43ed88f056 FIX Propal list - Problem of pagination on date 2021-09-27 23:02:19 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Laurent Destailleur
c9ae46db50 FIX Filter on categories 2021-09-27 11:34:26 +02:00
Laurent Destailleur
bb5eb9e292 FIX Filter on categories 2021-09-26 20:56:17 +02:00
lmarcouiller
f88d12f55d Fix #18809 : error on client tooltip 2021-09-24 11:16:34 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes 
another set of cleanup for action buttons
 2021-09-24 01:55:25 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
kamel
9266b4e8fd FIX Button text on proposal card for create a invoice 2021-09-21 19:44:49 +02:00
Laurent Destailleur
8cfccdcc5f
Merge pull request #18782 from OPEN-DSI/fix_00017 
FIX Button text on proposal card for create a invoice
 2021-09-21 19:44:05 +02:00
kamel
86a6e8af1f FIX Button text on proposal card for create a invoice 2021-09-21 14:15:17 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
1f76165e46 Fix do not show link on objects for object with existing hard link field 2021-09-19 01:35:42 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
89e8f24e15 Fix CSRF protection for all massactions 2021-09-18 22:38:25 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
7dfedd242a Fix add confirm_deleteline as sensitive action 2021-09-18 19:43:38 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
675a30d500 Fix phpcs 2021-09-17 19:42:41 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Laurent Destailleur
b546f21ef4 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-17 12:21:25 +02:00
Julien Gainza
65c4a21898 FIX move fetch_optionnal into $ac_static->fetch() 2021-09-13 16:35:13 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
5406e3d34e Fix phpcs 2021-09-09 16:06:16 +02:00
Laurent Destailleur
5d5b7c3af4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/main.inc.php
 2021-09-09 15:15:26 +02:00
Laurent Destailleur
ff74fbdf16
Update card.php 2021-09-09 02:37:47 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
4705d41ed2 FIX Relative discount with high nb of decimals 2021-09-08 22:00:16 +02:00
Regis Houssin
52419f28c5 FIX add DISTINCT 2021-09-07 12:38:15 +02:00
Regis Houssin
4aaaa8e21a FIX multicompany transverse mode compatibility 2021-09-07 12:10:35 +02:00
Julien Gainza
9d89e48d15 Fix : Add extrafields on API "get events list" 2021-09-06 15:55:33 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
248e68aada Code comment 2021-09-03 13:39:08 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
henrynopo
4c1d857991 Update remx.php 2021-09-02 19:36:48 +02:00
Laurent Destailleur
b217c5d43e
Merge pull request #18537 from henrynopo/patch-15 
Fix error no value of multicurrency discount amount consumed as payment to invoice
 2021-09-02 19:36:12 +02:00
Laurent Destailleur
8193e792b5 Fix responsive 2021-09-01 22:39:01 +02:00
Laurent Destailleur
1bce356efa Fix responsive 2021-09-01 21:34:59 +02:00
Laurent Destailleur
a7b0a837d4 Fix cancel button must be named "$cancel" everywhere. 2021-09-01 18:46:06 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2 
Undef vars2
 2021-09-01 18:36:26 +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
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
443827ff42 FIX #18531 2021-09-01 17:10:26 +02:00
Givriz
688d217bed Compatibility phpv8 2021-09-01 16:39:28 +02:00
Laurent Destailleur
239599d1b1
Merge pull request #18564 from OPEN-DSI/new-agenda-ext-enable-default 
NEW can enable/disable external calendar by default
 2021-09-01 13:44:12 +02:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
lvessiller
163b12925a FIX stickler-ci 2021-08-31 18:37:34 +02:00
lvessiller
6c2cf4377a NEW can enable/disable external calendar by default 2021-08-31 18:14:16 +02:00
henrynopo
c9db6bfdf6
Update remx.php 2021-08-29 08:51:02 +08:00
Gurvan Kervern
39fcc53fa7
Update peruser.php 2021-08-29 00:51:01 +08:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
8b996627eb
Merge pull request #18462 from grandoc/new_branch_22_08_2021 
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…
 2021-08-28 18:35:40 +02:00
Laurent Destailleur
a5bb833a0a
Update peruser.php 2021-08-28 17:39:23 +02:00
Laurent Destailleur
64c4e25c02 Fix warning 2021-08-28 05:40:07 +02:00
Laurent Destailleur
aab6281ba6 Clean code 2021-08-28 05:38:40 +02:00
Laurent Destailleur
1b859fe723 Fix warning 2021-08-28 05:24:53 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Anthony Berton
4880973ec5
Merge branch 'develop' into Edit_in_propal 2021-08-26 16:11:41 +02:00
stickler-ci
601cc865fb Fixing style errors. 2021-08-25 10:54:09 +00:00
GurvanKervern
d34e44e55c Fix undef vars 3 
To remove PHP8 warnings
 2021-08-25 18:02:57 +08:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Philippe Grand
ff47bf5226
Update card.php 2021-08-24 16:46:21 +02:00
Philippe Grand
0286a2e75d
Update card.php 2021-08-24 16:42:04 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
Christian Foellmann
227f61a711 replace remaining SubmitCancel buttons 2021-08-24 16:10:20 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Philippe GRAND
ba9ede39bf fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 265 2021-08-22 22:28:53 +02:00
Philippe GRAND
665dfb48e4 fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 125 2021-08-22 11:40:32 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
3ee4a6556a
Merge branch 'develop' into undefined 2021-08-19 13:43:32 +02:00
stickler-ci
172b672437 Fixing style errors. 2021-08-19 10:19:25 +00:00
Gurvan Kervern
476dfc289e
Update index.php 2021-08-19 18:16:47 +08:00
Laurent Destailleur
7af265db8a
Update card.php 2021-08-18 22:03:16 +02:00
Laurent Destailleur
1df2aeb233
Update card.php 2021-08-18 22:01:53 +02:00
stickler-ci
88b0408e42 Fixing style errors. 2021-08-18 13:57:19 +00:00
Gurvan Kervern
ab95c5f463
Update index.php 2021-08-18 21:55:00 +08:00
Gurvan Kervern
2d35106e0b
Update card.php 2021-08-18 17:52:21 +08:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169 2021-08-17 19:31:30 +02:00
Laurent Destailleur
59479a4c6e
Merge pull request #18405 from atm-gauthier/NEW/printFieldListFrom_on_several_lists 
NEW : printFieldListFrom hook call on several lists
 2021-08-17 15:58:28 +02:00
Laurent Destailleur
23083427e8 NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:36:30 +02:00
Laurent Destailleur
06a0d922cc NEW Can use the result_mode of mysqli driver. Save memory for list count 2021-08-16 22:01:58 +02:00
stickler-ci
af1f29bb16 Fixing style errors. 2021-08-16 11:22:49 +00:00
Gurvan Kervern
9f1ced1fd0 fix warnings 6 
Removing PHP8 warnings
 2021-08-16 19:06:38 +08:00
Gurvan Kervern
b0ea9fed0a fix warnings 1 
Removing all PHP8 warnings from error logs
 2021-08-16 18:05:29 +08:00
Gauthier PC portable 024
b2dad4d2ce Merge branch 'NEW/printFieldListFrom_on_commande_list' of github.com:atm-gauthier/dolibarr into NEW/printFieldListFrom_on_several_lists 2021-08-12 15:44:20 +02:00
Gauthier PC portable 024
22eda3fd63 NEW : add missing printFieldListFrom hook call on several lists 2021-08-12 15:39:52 +02:00
Laurent Destailleur
012eee7e06
Merge pull request #18317 from altairisfr/PROPAL_NOT_BILLABLE 
NEW : add constant PROPOSAL_ARE_NOT_BILLABLE
 2021-08-11 21:00:53 +02:00
Francis Appels
68482c637b Update actioncomm.class 
Property contactid should be contact_id
 2021-08-06 18:45:25 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Laurent Destailleur
7245fcec11 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 00:09:51 +02:00
Laurent Destailleur
a571fab177 css 2021-08-03 23:54:36 +02:00
Christophe Battarel
f00694470f rename constant to PROPOSAL_ARE_NOT_BILLABLE 2021-08-03 15:40:01 +02:00
Christophe Battarel
7a7287489d NEW : add constant PROPAL_REOPEN_UNSIGNED_ONLY 2021-08-03 11:24:21 +02:00
Christophe Battarel
2998c94884 NEW : add constant PROPAL_NOT_BILLABLE 2021-08-03 11:12:19 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
bd35d86268 Debug v14 2021-07-31 17:20:48 +02:00
jpb
15578c2ec2 merge conflict 2021-07-30 10:57:04 +02:00
Laurent Destailleur
079b014b14 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-26 00:41:35 +02:00
Laurent Destailleur
505543e18e Fix #yogosha6704 2021-07-26 00:37:47 +02:00
Laurent Destailleur
062c39c40d Fix html entities when we should not 2021-07-21 01:40:45 +02:00
stickler-ci
2f0ba41a53 Fixing style errors. 2021-07-20 13:35:10 +00:00
jpb
1237c5ba55 add msg to formconfirm on propal invoice and commande 2021-07-20 14:46:56 +02:00
BENKE Charlene
29bdbe02f2
Update index.php 2021-07-19 10:21:18 +02:00
Laurent Destailleur
0fd980b005
Update index.php 2021-07-14 13:57:17 +02:00
BENKE Charlene
7406f2cc85
a interventional drafts on commercial index 2021-07-14 12:55:33 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
cc4defd212 Fixing style errors. 2021-07-11 07:44:41 +00:00
fr69400
bf03a30a9f
Update note.php 2021-07-11 09:44:18 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
34f1cfe575 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/index.php
 2021-07-07 02:09:53 +02:00
Laurent Destailleur
3bc896be57 Debug v14 2021-07-07 02:07:35 +02:00
Laurent Destailleur
48435eb911 Fix navigation links 2021-07-07 01:58:06 +02:00
Laurent Destailleur
ff94c60cc7 Fix GETPOST with restricthtml 2021-07-07 01:45:31 +02:00
Laurent Destailleur
ced4ea1314 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2021-07-06 15:59:59 +02:00
Laurent Destailleur
37801184c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/holiday/class/holiday.class.php

Fix case of newByMonth
 2021-07-06 15:35:17 +02:00
Laurent Destailleur
c901e518a7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 02:11:28 +02:00
Laurent Destailleur
3dff7e29cc Fix #yogosha6567 2021-07-06 01:44:05 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
9b7c0a9246 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-07-03 18:32:31 +02:00
Laurent Destailleur
6ae1d192e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/card.php
 2021-07-02 16:14:12 +02:00
Laurent Destailleur
8bade0e4e7 Fix add permission 2021-07-02 16:11:42 +02:00
Laurent Destailleur
5b34ea6c22 FIX permission to close a proposal when using advanced permissions 2021-07-01 03:06:40 +02:00
Laurent Destailleur
1a63a379cc Fix missing permission 2021-07-01 03:03:59 +02:00
Francis Appels
b83f57da48 Fix some proposal php 8 warning 2021-06-29 16:26:48 +02:00
Laurent Destailleur
5dc82ccb71
Merge pull request #18023 from frederic34/patch-8 
fix inexistent right
 2021-06-26 12:18:42 +02:00
Frédéric FRANCE
fde23632ce
Update list.php 2021-06-24 20:20:50 +02:00
Frédéric FRANCE
aad45a8157
fix warnings in propal list 2021-06-24 20:15:57 +02:00
Frédéric FRANCE
7a2ec389a1
fix inexistent right 2021-06-24 18:57:22 +02:00
Laurent Destailleur
c03958a867 Fix look and feel v14 2021-06-23 19:02:14 +02:00
Laurent Destailleur
312968eeac Clean code 2021-06-22 11:38:02 +02:00
Laurent Destailleur
05c0bc4fac css 2021-06-22 10:44:49 +02:00
Laurent Destailleur
aca190d977 Fix css 2021-06-21 12:46:24 +02:00
Laurent Destailleur
ab2e50ef49 Fix css 2021-06-21 12:46:03 +02:00
Laurent Destailleur
88ff0e4795 Fix PHPCS 2021-06-18 00:59:18 +02:00
Laurent Destailleur
ceaa2a9c5e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/ticket/class/actions_ticket.class.php
 2021-06-17 22:06:26 +02:00
Laurent Destailleur
10dadb2247 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-17 22:02:29 +02:00
Laurent Destailleur
51eaecdc6b Fix phpcs 2021-06-17 22:02:06 +02:00
Laurent Destailleur
5063f29532 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/class/mailing.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/replenish.php
 2021-06-17 21:35:31 +02:00
atm-lena
9769e33eab notigger parameter 2021-06-17 10:41:55 +02:00
atm-lena
5b8a6f1d71 Add Trigger "MAILING_DELETE" 2021-06-17 10:41:03 +02:00
Laurent Destailleur
c4e8866727 Clean code 2021-06-16 21:20:27 +02:00
Laurent Destailleur
347c6ae8a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2021-06-14 20:13:27 +02:00
Laurent Destailleur
d154ec2344 FIX Collector to create lead was broken 2021-06-14 20:06:52 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Laurent Destailleur
95bea52984
Merge pull request #17854 from frederic34/patch-11 
add warning if outstanding limit is exceeded
 2021-06-10 12:19:50 +02:00
Laurent Destailleur
7b31ef0ff3 Fix warnings 2021-06-10 00:00:49 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Frédéric FRANCE
af6bbe23ca
add warning if outstanding limit is exceeded 2021-06-08 17:39:13 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
6eab0f5661 Fix css 2021-06-08 15:49:26 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest 
new: working on conference or booth object and event type #FoundationFunding
 2021-06-04 13:12:32 +02:00
Laurent Destailleur
5a3d7663d1
Merge pull request #17764 from Hystepik/develop#3 
Fix of a bug on mass mailing
 2021-06-04 12:32:48 +02:00
Laurent Destailleur
920f8b0b58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 12:29:04 +02:00
lmarcouiller
c77dee0922 changes to fetch after send 2021-06-04 12:27:50 +02:00
Laurent Destailleur
84f2e06b91
Merge pull request #17754 from frederic34/patch-16 
fix warnings
 2021-06-04 11:55:14 +02:00
Laurent Destailleur
ca1da3c83c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 11:53:21 +02:00
Laurent Destailleur
e73dad30bb Warning 2021-06-04 11:53:12 +02:00
Laurent Destailleur
5650deec58
Merge branch 'develop' into patch-15 2021-06-04 11:52:29 +02:00
Laurent Destailleur
81cc8cef75
Merge pull request #17797 from Hystepik/develop#7 
Fix propal/index.php error on thirdparty display
 2021-06-04 09:07:53 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
lmarcouiller
431691cec4 Fix propal/index.php error on thirdparty display 2021-06-02 15:18:45 +02:00
lmarcouiller
05a966b93e Fix of a bug on mass mailing 2021-05-28 10:29:46 +02:00
Frédéric FRANCE
e1a427f160
fix warnings 2021-05-27 22:40:26 +02:00
Frédéric FRANCE
3b381dccc3
fix warnings 2021-05-27 22:33:25 +02:00
Laurent Destailleur
2caaa52e85 Doc 2021-05-27 02:52:51 +02:00
Laurent Destailleur
4f61286ae2 Small perf fix 2021-05-27 02:36:16 +02:00
Dorian Vabre
fe6b25ede6 fix on $value 2021-05-26 09:48:13 +02:00
Frédéric FRANCE
9e3de39245
fix status/percent 
in sql it is a.datep as dp, not datep
 2021-05-25 23:00:21 +02:00
Frédéric FRANCE
332d8c9105
fix warnings 2021-05-25 22:24:46 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
 2021-05-25 20:17:54 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Dorian Vabre
fe272d3292 wip name of contact to add on ics file 2021-05-21 16:01:44 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +02:00
Dorian Vabre
307ab92bc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 16:13:42 +02:00
Laurent Destailleur
91f85abb7e Fix only comment to understand code are allowed 2021-05-20 14:55:37 +02:00
Sylvain Legrand
a3d1b49c65 Error in list when using alias name of thirdparty 2021-05-19 19:08:58 +02:00
Laurent Destailleur
cf0da5cee7 css 2021-05-19 15:00:44 +02:00
Laurent Destailleur
3550fa2be4 Fix css 2021-05-19 14:48:30 +02:00
Laurent Destailleur
92ccf5982a Fix responsive 2021-05-19 14:38:39 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
Laurent Destailleur
8e39eff180 Look and feel v14 2021-05-18 18:18:00 +02:00
Adrien Raze
90d159fbc3 FIX : Missing hook in cibles.php (for mailing) 2021-05-18 14:58:46 +02:00
Laurent Destailleur
c2cb055b0a Fix look and feel v14 2021-05-18 14:00:29 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list 2021-05-18 12:27:30 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list 
Add popup thirdparty info in list
 2021-05-18 12:15:51 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Anthony Berton
6fe9fe330d delete fetch 2021-05-17 23:54:31 +02:00
Anthony Berton
58db723502 thirdparty info popup list 2021-05-17 23:27:33 +02:00
Anthony Berton
31cd71d8a3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into look_feel_user_author_list 2021-05-17 18:34:41 +02:00
Anthony Berton
9dcf2044a9 Update list.php 2021-05-17 18:33:27 +02:00
Anthony Berton
0b7f474dd3 look_feel user author in list 2021-05-17 18:04:21 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1 
Fix  #17475 : Add of List-Unsubscribe in mass emailing
 2021-05-17 10:23:21 +02:00
Laurent Destailleur
a4f4cca895
Prefix length may have different length and be at a different place so i remove this tag. Must be replaced by a generic method to substring a substitution variable. 2021-05-17 08:36:49 +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
ea78462167 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-17 07:33:37 +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
Maxime Kohlhaas
db32f882e8 Fix use of DatePropal instead of Date 2021-05-15 07:45:04 +02:00
stickler-ci
50d4d28c14 Fixing style errors. 2021-05-14 11:54:50 +00:00
Ferran Marcet
ce6df0ee4a FIX: Filter of the dates in the lists is lost 2021-05-14 13:50:12 +02:00
lmarcouiller
06c1817930 Update mailing-send script and mailling card 2021-05-12 09:21:28 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
Laurent Destailleur
60dd26f21d Fix do not lose selection if error 2021-05-11 22:10:40 +02:00
Laurent Destailleur
91312f0411 Fix url for emailing unsubscribe 2021-05-11 21:13:52 +02:00
Laurent Destailleur
207aa8550a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-11 21:02:38 +02:00
Laurent Destailleur
dc2c5aa0a8 Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/theme/eldy/global.inc.php
	htdocs/theme/eldy/info-box.inc.php
 2021-05-11 21:02:27 +02:00
Laurent Destailleur
8cf99448e1
Merge pull request #17523 from bb2a/warhouse_mod_stock_activ 
Warehouse filter if stock activate and not sending
 2021-05-11 20:43:28 +02:00
Pierre Payet
4ce81ee535 set new outside the loop, add fetch result check 2021-05-11 20:30:57 +02:00
Laurent Destailleur
780254bfd4
Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey 
New substitution key for member new form url in mailing
 2021-05-11 19:41:12 +02:00
Laurent Destailleur
8024e769fd
Merge pull request #17552 from aspangaro/14b2 
Fix Title customer proposal
 2021-05-11 18:55:02 +02:00
Pierre Payet
ff178667a3 add thirdparty customer code to substitutionarray 2021-05-11 12:33:35 +02:00
Dorian Vabre
e31d8f89f5 wip filter 2021-05-10 17:13:57 +02:00
Dorian Vabre
c85b75924f wip on adding a filter for the ics file + fix on class name 2021-05-10 16:57:48 +02:00
Alexandre SPANGARO
6e9597cd90 Fix Title company customer card 2021-05-09 22:06:05 +02:00
Alexandre SPANGARO
c2319c0a20 Fix Title customer proposal info card 2021-05-09 21:19:13 +02:00
Alexandre SPANGARO
9cec7e5936 Fix Title customer proposal documents card 2021-05-09 21:15:54 +02:00
Alexandre SPANGARO
dbccb75294 Fix Title customer proposal notes card 2021-05-09 21:13:29 +02:00
Alexandre SPANGARO
dd76ff0f24 Fix Title customer proposal contact card 2021-05-09 21:11:14 +02:00
Alexandre SPANGARO
2dc2256545 Fix Title customer proposal card 2021-05-09 21:08:55 +02:00
daraelmin
22d9c4c166
Update card.php 2021-05-08 09:35:41 +02:00
daraelmin
2e1158934b
Copyright 2021-05-08 09:20:59 +02:00
daraelmin
33d68db9a1
add entity in new subst publiclink_newmemberform 2021-05-08 09:18:41 +02:00
Anthony Berton
2e50fde9aa edit_in_propal 2021-05-07 22:13:53 +02:00
daraelmin
7c27e9f931
too much underscore 2021-05-07 17:19:33 +02:00
daraelmin
0173d8db5f
Add substitution key for membernewform url in mailing 2021-05-07 17:09:59 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Anthony Berton
d84b0bae9d init 2021-05-06 23:23:50 +02:00
daraelmin
866857c111
Html link instead of url in substitutionarray 2021-05-04 21:57:59 +02:00
lmarcouiller
457a96bc34 Fix #17475 : Add of List-Unsubscribe in mass emailing 2021-05-04 15:11:30 +02:00
daraelmin
034378a958
Add online substitution keys link in mailing 2021-05-04 00:58:29 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Florian HENRY
9278228e20 FIX: create event from contact card preselect contact correctly 2021-05-03 18:08:49 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +02:00
Laurent Destailleur
5a1f2db024 Clean sql 2021-04-30 10:57:21 +02:00
fr69400
96baa1ef49 wrong variable name 2021-04-29 17:36:45 +02:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
4926ac1e24 Fix make protected method not visible 2021-04-28 15:25:06 +02:00
Laurent Destailleur
6dcee425a1
Update card.php 2021-04-28 15:07:31 +02:00
Sylvain Legrand
18d2bef8f3
Error 500 on propal card when we change the deadline 
if we don't use the automatic generation for PDF documents (MAIN_DISABLE_PDF_AUTOUPDATE is set to 1) when we change the deadline on a proposal we get an error 500.
 2021-04-28 11:58:34 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Laurent Destailleur
48a50f3b10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
 2021-04-27 01:58:19 +02:00
Laurent Destailleur
804eac55e9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-04-27 01:46:04 +02:00
Laurent Destailleur
e9b8e81773
Update advtargetemailing.class.php 2021-04-27 01:45:10 +02:00
Laurent Destailleur
539954f760 Clean code 2021-04-27 01:12:40 +02:00
Laurent Destailleur
d2b91e934a Clean code 2021-04-27 01:09:46 +02:00
Laurent Destailleur
f54d14bfd6 Add method checkValForAPI to clean data from API input 2021-04-27 01:05:14 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Laurent Destailleur
87393cee98 Clean code 2021-04-26 11:59:47 +02:00
Laurent Destailleur
c9d6bc70e8 Clean code 2021-04-26 10:22:28 +02:00
Laurent Destailleur
389b71bc7e Clean API 2021-04-25 19:21:48 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Laurent Destailleur
46ea1084f5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/extrafieldsinexport.inc.php
	htdocs/product/stock/card.php
 2021-04-19 20:59:10 +02:00
Laurent Destailleur
61df76dd9a Fix pb in date format %a %b when using a negative timezone 
Enhance date management and unit tests.
 2021-04-19 12:48:08 +02:00
Laurent Destailleur
a74b237a7b Add a schedule dtask to send reminder by email on date due. 2021-04-19 10:35:19 +02:00
stickler-ci
318a783237 Fixing style errors. 2021-04-19 07:19:45 +00:00
Gauthier PC portable 024
8c428081ab FIX : test on link type 2021-04-19 09:17:33 +02:00
Gauthier PC portable 024
ff8aae1209 Merge branch 'fix_adv_target_emailing_extrafields_link' of github.com:atm-gauthier/dolibarr into fix_adv_target_emailing_extrafields_link 2021-04-19 09:16:06 +02:00
Gauthier PC portable 024
5b6439ca5e FIX : cast int 2021-04-19 09:15:47 +02:00
Laurent Destailleur
12e2055faa
Merge pull request #17259 from bb2a/mass_action_propal_right 
Workflo mass action propal sign or NotSigned and notification #17143
 2021-04-16 20:45:14 +02:00
Laurent Destailleur
4bc0c5b0b6 Fix cast 2021-04-16 20:43:04 +02:00
Laurent Destailleur
af9c2384ef Add warning 2021-04-16 19:14:01 +02:00
stickler-ci
37f44f4a07 Fixing style errors. 2021-04-16 14:58:57 +00:00
Gauthier PC portable 024
f8fcf7c16b FIX : type link extrafield case for advanced target emailing 2021-04-16 16:55:19 +02:00
Laurent Destailleur
db5dcd3e52 NEW When a doc file is shared, link is visible from main page of doc. 2021-04-15 17:56:55 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
stickler-ci
26767c1550 Fixing style errors. 2021-04-14 00:36:07 +00:00
Anthony Berton
3b2a27de16 Update list.php 2021-04-14 02:35:39 +02:00
Anthony Berton
5a68718eb2 Update list.php 2021-04-14 02:32:39 +02:00
Anthony Berton
e1557b15ee Update list.php 2021-04-14 01:12:20 +02:00
Anthony Berton
c7d0ff94f9 Update list.php 2021-04-14 01:03:32 +02:00
Anthony Berton
992cf0a091 Update list.php 2021-04-14 00:29:06 +02:00
Anthony Berton
2c18e31ee0 Merge branch 'mass_action_propal_right' of https://github.com/bb2a/dolibarr into mass_action_propal_right 2021-04-14 00:28:07 +02:00
Anthony Berton
9e40b8bf4c Update list.php 2021-04-14 00:27:46 +02:00
stickler-ci
78b08586e3 Fixing style errors. 2021-04-13 22:11:04 +00:00
Anthony Berton
29dd2e4b67 Update list.php 2021-04-14 00:07:29 +02:00
Anthony Berton
22d48c9cb6 Update list.php 2021-04-14 00:03:33 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Laurent Destailleur
f54fd1063b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-13 19:39:08 +02:00
Laurent Destailleur
c93f88e47a Debug mass action after regression on close on proposal 2021-04-13 19:38:55 +02:00
Laurent Destailleur
8c9cacba4d
Merge branch 'develop' into 14a36 2021-04-13 16:05:57 +02:00
Anthony Berton
69d489c12b Update list.php 2021-04-13 13:00:44 +02:00
Anthony Berton
b2eaca75bf Update list.php 2021-04-13 10:55:48 +02:00
Anthony Berton
1b995226b7 add_filter_warehouse_propal 2021-04-13 10:43:36 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2 Clean code of ol deprecated option 2021-04-12 15:37:26 +02:00
Laurent Destailleur
8fa943edc3 Fix select field in multiselect of languages 2021-04-12 14:26:09 +02:00
Laurent Destailleur
eb3438baa7 css 2021-04-12 13:02:34 +02:00
Alexandre SPANGARO
8d72448f43 Add right supplier_order 2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Alexandre SPANGARO
ab5599a672 Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-11 20:53:30 +02:00
Laurent Destailleur
91fc78ac9c FIX #17192 - With tz < 0, event is show in bad day on calendar views 
Conflicts:
	htdocs/comm/action/index.php
 2021-04-11 16:18:16 +02:00
Laurent Destailleur
053be7a63c FIX #17192 - With tz < 0, event is show in bad day on calendar views 2021-04-11 16:02:52 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
 2021-04-09 14:17:41 +02:00
Laurent Destailleur
7f91713c4a Fix merge not complete 2021-04-09 14:06:30 +02:00
Laurent Destailleur
f5881c6199 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2021-04-09 14:02:14 +02:00
Laurent Destailleur
fe7654c067 Complete doc 2021-04-09 13:34:19 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
Laurent Destailleur
de7c3f5e0c
Merge pull request #17139 from OPEN-DSI/fix_00001 
FIX: Fix when add or modify ressources on events with duplicate entries
 2021-04-08 15:50:00 +02:00
kamel
fcc27e9177 Corrections 2021-04-07 09:49:20 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
kamel
c44522594a FIX: Fix when add or modify ressources on events with duplicate entries 2021-04-06 16:04:30 +02:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Laurent Destailleur
a3fb8d3e14 Factorize code 2021-04-05 19:34:56 +02:00
ptibogxiv
bd88806982
Fix order status label in comm index page 2021-04-05 12:07:51 +02:00
Laurent Destailleur
6fc19c626d Try fix for #17094 2021-04-04 17:05:01 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
354adbde54 Look and feel v14 2021-04-01 12:27:02 +02:00
Laurent Destailleur
4b35645920 FIX #yogosha5753 2021-04-01 10:11:54 +02:00
Laurent Destailleur
9c92dfd3e1 Function set_price_level() has been renamed into setPriceLevel() to 
follow camelcase rules
 2021-04-01 10:05:37 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00