2
0
forked from Wavyzz/dolibarr
Commit Graph

779 Commits

Author SHA1 Message Date
Laurent Destailleur
d380da3f4c Merge pull request #13250 from FHenry/dev_fix_createLineWithCOrrectLink
NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other documents lines the id of original lines and origin class line rather than origin object id and origin object type
2020-03-12 12:57:04 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
florian HENRY
eaa9d22783 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_createLineWithCOrrectLink 2020-03-12 09:45:04 +01:00
florian HENRY
29b2ea77d5 NEW : special option MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION to store in document line created form other document s lines the id of origin lines and origin class line rather than origin object id and origin object type 2020-03-12 09:44:43 +01:00
Laurent Destailleur
3edc3dd382 Fix fields definition 2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d Fix table fields 2020-03-08 19:25:00 +01:00
Laurent Destailleur
054ffb7547 Depreciate variables not used by Dolibarr. 2020-03-06 14:38:06 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
0b37c2c201 FIX #13263 2020-03-04 00:53:07 +01:00
Laurent Destailleur
7866f89585 Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Laurent Destailleur
1344ce06a5 Merge pull request #12317 from OPEN-DSI/new-propal-tooltip-note
NEW add public and private notes in propal list
2020-02-05 21:41:17 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
bfc8369418 Fix phpcs 2020-01-22 14:15:08 +01:00
Laurent Destailleur
2d07a08e55 Fix init of specimen 2020-01-21 00:22:57 +01:00
VESSILLER
48297759fb Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-tooltip-note 2020-01-16 10:53:57 +01:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Laurent Destailleur
622dc7e8d7 Debug v11 2020-01-07 22:01:55 +01:00
lvessiller-opendsi
dec64b45e8 Merge branch 'develop' into new-propal-tooltip-note 2019-12-26 10:06:38 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Laurent Destailleur
f98713efdd Update propal.class.php 2019-12-10 19:20:23 +01:00
Laurent Destailleur
452976850f Update propal.class.php 2019-12-10 19:18:45 +01:00
David
4c463cdbb5 FIX: propal update
Update fields 'date' and 'fin_validite'
2019-12-10 16:16:33 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
3430a88c72 Fix $conf not defined 2019-11-12 10:13:22 +01:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
stickler-ci
bb74d2f8bd Fixing style errors. 2019-11-10 10:00:07 +00:00
Philippe GRAND
6e0c028d51 add some comment 2019-11-10 10:59:44 +01:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
VESSILLER
bcafef42b0 NEW tooltip notes with first public note and then private note 2019-11-06 16:45:52 +01:00
VESSILLER
fefb4a7f95 FIX replace <br /> by <br> 2019-11-05 15:13:44 +01:00
VESSILLER
668bb0cb86 NEW add public and private notes in propal list 2019-11-04 11:03:39 +01:00
Laurent Destailleur
e087ac434d Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610 Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
4fd20157c2 Merge pull request #12298 from frederic34/patch-22
Update propal.class.php
2019-11-02 10:08:33 +01:00
Frédéric FRANCE
77d4ca81dc Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701 Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Frédéric FRANCE
693506cebd Update propal.class.php
socid is int
2019-11-01 20:26:55 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01: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
1a10b30a76 clean indent in comm directory 2019-10-26 14:28:40 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
stickler-ci
4b7987374b Fixing style errors. 2019-10-14 14:46:04 +00:00
ro@t.com
2149b155d1 ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning 2019-10-10 15:57:26 +02:00
Laurent Destailleur
8ad81a092a Clean code 2019-10-01 16:19:54 +02:00