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

1769 Commits

Author SHA1 Message Date
Laurent Destailleur
4d90fb22de Fix sql syntax error 2020-11-25 15:07:26 +01:00
Laurent Destailleur
5030f0c587 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/opensurvey/wizard/create_survey.php
 2020-11-25 14:55:31 +01:00
Laurent Destailleur
bf7b6ee00d Fix delete of proposal 2020-11-25 14:15:59 +01:00
Frédéric FRANCE
66ad0e5b13
add note on ecm files 2020-11-24 18:54:59 +01:00
Laurent Destailleur
efc539c4b4 Fix css 2020-11-23 19:53:58 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Laurent Destailleur
9004be1df2 Debug feature to send remind by email 2020-11-21 17:42:07 +01:00
Laurent Destailleur
6bbeb6d3a0 Fix debug creation of shipment with virtual product. 2020-11-16 16:31:05 +01:00
Laurent Destailleur
ac5fa6c6df Clean code 2020-11-16 12:54:16 +01:00
Laurent Destailleur
2e0e42e918 Fix warning 2020-11-15 14:37:21 +01:00
Frédéric FRANCE
0a5e041775
Merge remote-tracking branch 'upstream/develop' into odtformembers 2020-11-14 00:56:21 +01:00
Frédéric FRANCE
4ca3c0aa95
Add odt for members 2020-11-14 00:48:13 +01:00
Laurent Destailleur
3c5ef18b36 FIX #15390 2020-11-14 00:47:28 +01:00
Laurent Destailleur
5498800ad6
Update commonobject.class.php 2020-11-13 10:02:34 +01:00
Günter Lukas
2da8fb75a8
Fix #15371 
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
 2020-11-12 15:59:42 +01:00
Laurent Destailleur
03e60bf084 Fix warning 2020-11-11 20:27:21 +01:00
Laurent Destailleur
90884d8085 Fix compatibility with date_delivery 2020-11-11 18:08:40 +01:00
Laurent Destailleur
807d3b99c9 Fix update field when visilbity is 4 or -4 2020-11-09 09:53:56 +01:00
Laurent Destailleur
c071dd254b Fix warning 2020-11-07 14:35:28 +01:00
Laurent Destailleur
a72107ce06 Fix regression 2020-11-07 14:33:21 +01:00
Laurent Destailleur
2fdba3ad46 Fix warning 2020-11-07 12:53:52 +01:00
Laurent Destailleur
2da6fc1ef0 Remove warning 2020-11-07 12:06:14 +01:00
Laurent Destailleur
fe8d93f72d Fix phpcs 2020-11-07 01:17:54 +01:00
Laurent Destailleur
824b778d51
Update commonobject.class.php 2020-11-05 09:07:06 +01:00
Francis Appels
5866facf11 Update commonobject. 
Don't think $fk_delivery_address is deprecated, also no alternative indicated.
Switch of implode paramenters.
showInputField preselected value for array type can be array.
 2020-11-04 20:31:55 +01:00
Laurent Destailleur
b0e2d40533 Debug and fix v13 2020-11-03 14:19:54 +01:00
Laurent Destailleur
878b8f25de
Update commonobject.class.php 2020-11-02 09:29:26 +01:00
Frédéric FRANCE
a1016d79a2
initSpecimenCommon 2020-11-01 20:33:06 +01:00
Laurent Destailleur
125b94d749
Merge pull request #15234 from frederic34/patch-8 
doxygen
 2020-10-31 15:05:41 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
78b94c775b
Update commonobject.class.php 2020-10-31 13:59:46 +01:00
Laurent Destailleur
1af3709793
Merge pull request #15232 from frederic34/patch-6 
doxygen
 2020-10-31 13:50:28 +01:00
Laurent Destailleur
2b09b7be8e Fix css 2020-10-31 13:47:50 +01:00
Frédéric FRANCE
85b3b5de36
Update commonobject.class.php 2020-10-31 13:24:09 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
8c646cdf4f
Merge pull request #15207 from frederic34/patch-11 
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
 2020-10-29 17:49:16 +01:00
Regis Houssin
032813fa19 FIX extrafield date not recover in create/edit mode 2020-10-29 11:05:45 +01:00
Frédéric FRANCE
4d716e74bd
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER 2020-10-28 19:06:45 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Laurent Destailleur
efce53abd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-26 18:17:23 +01:00
Laurent Destailleur
2c2142ddba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-26 18:13:47 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
Laurent Destailleur
2638d4596a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2020-10-25 21:33:13 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
e7743948cb
Merge pull request #15120 from frederic34/patch-6 
Update commonobject.class.php
 2020-10-25 14:50:56 +01:00
Maxime Kohlhaas
bedfb7ac8d Fix BOM position field 2020-10-24 19:19:06 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
c3863aeed8
Update commonobject.class.php 2020-10-23 18:18:01 +02:00
Laurent Destailleur
f00fa93903 FIX check on required field when updating 1 extrafields. 2020-10-23 17:31:17 +02:00
Laurent Destailleur
572637b726 Enhance update of 1 extrafield (simple update instead of delete+insert) 2020-10-23 15:31:13 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00
Laurent Destailleur
a17c391efe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/product/composition/card.php
 2020-10-22 17:38:48 +02:00
Laurent Destailleur
cfcac7e053 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2020-10-22 17:34:48 +02:00
Florian HENRY
d4fd71d0b3 fix #14649 2020-10-20 19:58:11 +02:00
Laurent Destailleur
f2fafe04b6 Update doc 2020-10-17 18:16:03 +02:00
Alexandre SPANGARO
b3b37dd9ee Fix sticklerCI 2020-10-09 09:32:50 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Aurélien
c8cd55e158
debug access right after rename class #14697 2020-10-06 15:57:50 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
879d041398 Can force the typeof check of GETPOST into $fields for type text. 2020-09-29 20:48:40 +02:00
Laurent Destailleur
33d578a660 Fix bad management of default value in database on create form 2020-09-26 04:25:06 +02:00
Laurent Destailleur
c61e8f052b NEW Add property cssview when declaring fields of an object 2020-09-22 08:54:40 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Laurent Destailleur
009c7eaf31 Standardize code with module builder 2020-09-11 16:16:04 +02:00
Laurent Destailleur
12fba9e679 Fix label 2020-09-09 15:19:12 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
lvessiller
86ce4315be FIX load default linked options for linked sellist extra fields 2020-09-07 15:19:58 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Laurent Destailleur
9868140693 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-02 19:20:12 +02:00
Laurent Destailleur
4dca1929e0 Can close a recruitment job 2020-09-02 19:19:47 +02:00
Laurent Destailleur
6ccec31fa0
Merge pull request #14605 from Tim-Otte/fix-contact-type-translation 
FIX: Contact type translation
 2020-09-02 18:09:37 +02:00
Tim Otte
8a5a171cf8 Added agenda translation 2020-09-01 16:59:40 +02:00
Tim Otte
71471a054d Loaded the required translations 2020-09-01 16:53:42 +02:00
Laurent Destailleur
bd7261a449 Debug recruitment module 2020-08-23 18:04:52 +02:00
Laurent Destailleur
dabe804299 Add numbering modules for candidatures. Mass action Validate. 2020-08-22 03:49:46 +02:00
Laurent Destailleur
7217dc3114 Better perf for phpunit on very large databases 2020-08-19 01:43:48 +02:00
Laurent Destailleur
964c4ef0d2 Standardize code. Use model_pdf. 2020-08-18 14:48:38 +02:00
Laurent Destailleur
8bfa6df1a6 FIX Update extrafields on line only if it is supported 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2020-08-17 16:06:36 +02:00
Laurent Destailleur
8e00c9c304 FIX Update extrafields on line only if it is supported 2020-08-17 15:53:33 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
 2020-08-03 14:44:01 +02:00
Laurent Destailleur
c2bb0431f0 FIX input field of extrafields must keep data if form submit fails. 2020-08-03 12:31:30 +02:00
Laurent Destailleur
d59bcd3f5b FFIX error creating record when extrafields price exists in other entity 2020-08-03 12:08:33 +02:00
Laurent Destailleur
7149cbb532 NEW Add public note on products. This also partially fix the #14342 2020-08-02 17:09:21 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
Laurent Destailleur
ecfdb4bbac Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-02 16:02:09 +02:00
Laurent Destailleur
3d79950c27
Update commonobject.class.php 2020-07-29 14:13:29 +02:00
Laurent Destailleur
714481f7e5 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:08:31 +02:00
Laurent Destailleur
a2dd80bcc8 FIX Navigation in object fails to find the next ref in some cases 2020-07-26 21:07:39 +02:00
quentin
255bd6b26c FIX null required 2020-07-22 11:54:52 +02:00
Laurent Destailleur
0d24b979c1 Fix phpcs 2020-07-11 01:20:20 +02:00