lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,080 Commits 43 Branches 150 Tags 886 MiB
982f8eb95d
Commit Graph

8835 Commits

Author SHA1 Message Date
Laurent Destailleur
084b2411df
Merge pull request #15550 from OPEN-DSI/new-supplier-product-list-with-stock 
NEW show stock in supplier product select list
 2020-11-26 18:56:04 +01:00
Laurent Destailleur
82da0d01f1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formorder.class.php
	htdocs/fourn/commande/list.php
 2020-11-26 18:52:00 +01:00
Laurent Destailleur
b043442b91 Fix link and selection of status of purchase order. 2020-11-26 17:53:57 +01:00
Laurent Destailleur
3588781180 Debug v13 2020-11-26 14:15:20 +01:00
lvessiller
17e13eb821 NEW show stock in supplier product select list 2020-11-26 14:12:02 +01:00
Laurent Destailleur
e272130a6a Fix phpcs 2020-11-26 08:40:08 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
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
0d24fc56b9
doxygen 2020-11-24 22:40:41 +01:00
Laurent Destailleur
81566289cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
 2020-11-24 11:07:35 +01:00
Laurent Destailleur
bc1d286673
Merge pull request #15495 from Givriz/dev 
Feature : creation of a "button-cancel" class
 2020-11-23 21:53:45 +01:00
Laurent Destailleur
5822fcfbed FIX several warning with the barcode use in ODT templates 2020-11-23 21:38:45 +01:00
Laurent Destailleur
efc539c4b4 Fix css 2020-11-23 19:53:58 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Laurent Destailleur
7d1b84d482 Fix warning 2020-11-22 22:58:14 +01:00
Laurent Destailleur
af2eabb24d Fix warning 2020-11-22 15:06:53 +01:00
Laurent Destailleur
f6d6efa288 CSS 2020-11-22 13:23:56 +01:00
Laurent Destailleur
986f918436 Fix image edition when gravatar module is on 2020-11-22 01:47:17 +01:00
Laurent Destailleur
a30e842521 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-21 23:48:34 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev 
Feature : creation of a "button-save" class
 2020-11-21 23:44:30 +01:00
Laurent Destailleur
782e3b4c23
Merge pull request #15458 from frederic34/patch-23 
doxygen
 2020-11-21 23:42:56 +01:00
Laurent Destailleur
9004be1df2 Debug feature to send remind by email 2020-11-21 17:42:07 +01:00
Laurent Destailleur
3534555909 Fix setup of scheduled jobs 2020-11-21 14:14:53 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop 
Update fork
 2020-11-20 13:53:43 +01:00
Laurent Destailleur
07c192efb8
Merge pull request #15457 from frederic34/patch-22 
Update ldap.class.php
 2020-11-20 13:37:24 +01:00
Frédéric FRANCE
b4a5134a7f
doxygen 2020-11-19 22:25:02 +01:00
Frédéric FRANCE
5d4d7c99d6
Update ldap.class.php 
The variable $result seems to be never defined.
 2020-11-19 22:07:32 +01:00
Frédéric FRANCE
efa5c89c45
Update rssparser.class.php 
The variable $**** does not seem to be defined for all execution paths leading up to this point.
 2020-11-19 22:03:13 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
83eaf16a22 Fix css 2020-11-18 16:23:08 +01:00
Laurent Destailleur
e78b9a421d Fix sql 2020-11-18 13:14:29 +01:00
Laurent Destailleur
17f35e16b9
Merge pull request #15436 from OPEN-DSI/add_extended_infos_on_select_contacts 
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
 2020-11-18 13:12:03 +01:00
Laurent Destailleur
ce173d7b39
Merge pull request #15424 from Tim-Otte/fix-15423 
Fix for #15423
 2020-11-18 12:46:41 +01:00
Laurent Destailleur
a5a7197506
Update extrafields.class.php 2020-11-18 12:45:37 +01:00
Laurent Destailleur
166bb5cc75
Merge pull request #15421 from frederic34/patch-8 
fix dir for member photo in odt tag
 2020-11-18 12:37:03 +01:00
Laurent Destailleur
889a5d0be1
Update commondocgenerator.class.php 2020-11-18 12:04:41 +01:00
kamel
73b35f334e NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox) 
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 2020-11-18 09:41:42 +01:00
Laurent Destailleur
17f78f9cec FIX Protection to avoid duplicate submit when creating a payment. 2020-11-17 18:39:34 +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
65144f4d5a fix warning 2020-11-16 11:37:28 +01:00
Tim Otte
4a1f61d759 Fix for #15423 2020-11-16 11:12:43 +01:00
Frédéric FRANCE
8cff0222cd
Update commondocgenerator.class.php 2020-11-15 23:58:35 +01:00
Frédéric FRANCE
35653bb855
fix dir for member photo in odt tag 2020-11-15 23:45:13 +01:00
Laurent Destailleur
89a77fad2c Fix warning 2020-11-15 16:56:30 +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
Laurent Destailleur
7da2d6cda2
Merge pull request #15391 from frederic34/patch-8 
doxygen
 2020-11-14 00:48:52 +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
Frédéric FRANCE
42ddf7e27b
doxygen 2020-11-13 20:45:03 +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
1dbc91e343 Clean code 2020-11-12 13:44:57 +01:00
Laurent Destailleur
767f07d02e Debug function to show list of files in ECM module 2020-11-11 22:47:06 +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
db08786ddf Add missing properties 2020-11-10 20:13:54 +01:00
Laurent Destailleur
29f0a9b784 Fix in select of user when firstname and lastname is empty 2020-11-10 15:03:35 +01:00
Laurent Destailleur
f8ddad4d4c Fix warning 2020-11-10 13:20:45 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-11-09 14:18:56 +00:00
Laurent Destailleur
0f90cee597 Fix missing fields 2020-11-09 15:15:21 +01:00
Laurent Destailleur
5be634cbd4 Clean code 2020-11-09 11:34:58 +01:00
Laurent Destailleur
807d3b99c9 Fix update field when visilbity is 4 or -4 2020-11-09 09:53:56 +01:00
Laurent Destailleur
310123fe33
Merge pull request #15331 from Ahuahuachi/develop 
NEW Allow disable multiple file upload in form_attach_new_file method
 2020-11-08 12:38:29 +01:00
Laurent Destailleur
e103503bb1 Fix warning php8 2020-11-08 12:34:45 +01:00
Alfredo Altamirano
f57c6dd25e Add $disablemulti option to form_attach_new_file method 
This new option allows to disable multiple file upload for use on specific upload forms
 2020-11-07 18:03:55 -06:00
Laurent Destailleur
9d3a25e2a3 Doxygen 2020-11-08 00:35:10 +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
c097e140cc Fix php8 2020-11-06 15:41:34 +01:00
Laurent Destailleur
ac6f8e4e7c Debug v13 2020-11-06 11:52:48 +01:00
Laurent Destailleur
1d9aacc7da Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2020-11-05 09:51:28 +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
jcp
1f483d7c28 Fix force payment mode to create withdrawal 2020-11-04 11:43:03 +01:00
Laurent Destailleur
b0e2d40533 Debug and fix v13 2020-11-03 14:19:54 +01:00
Laurent Destailleur
5f290e0de1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-02 11:41:19 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Laurent Destailleur
ea3106cd07
Merge pull request #15252 from frederic34/specimencommon 
initSpecimenCommon
 2020-11-02 09:29:48 +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
ce7a96cbf1 Add more assertion 2020-11-01 20:11:09 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
63a03cdad6 FIX #15208 2020-11-01 14:34:29 +01:00
Laurent Destailleur
4feed10b75
Merge pull request #15246 from hregis/develop_bug2 
FIX to avoid error with geoip
 2020-11-01 13:54:58 +01:00
Regis Houssin
e19e56e14c FIX to avoid error with geoip 2020-11-01 10:47:54 +01:00
Frédéric FRANCE
d9bf49c5dc
phpcs 2020-10-31 21:04:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Laurent Destailleur
125b94d749
Merge pull request #15234 from frederic34/patch-8 
doxygen
 2020-10-31 15:05:41 +01:00
stickler-ci
284c9bc6a8 Fixing style errors. 2020-10-31 13:34:01 +00: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
11f9c4cfbd
Merge pull request #15117 from atm-jpb/develop_editorRate 
# New multi-currency exchange rate editor
 2020-10-31 13:55:42 +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
cea61d3b52 Fix var 2020-10-31 12:44:14 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Laurent Destailleur
b3333da5c1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/main.inc.php
 2020-10-30 04:39:41 +01:00
Laurent Destailleur
840ca73464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/main.inc.php
	htdocs/theme/eldy/info-box.inc.php
	htdocs/theme/eldy/style.css.php
 2020-10-30 04:21:07 +01:00
Laurent Destailleur
1b5bcaccc6 Fix remove warnings 2020-10-30 04:13:31 +01:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:35:40 +01:00
Laurent Destailleur
263b679af4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/tpl/advtarget.tpl.php
 2020-10-30 03:31:04 +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
f760b20bde Fix double semi colon 2020-10-28 17:48:20 +01:00
Florian Mortgat
a4af2e94a9 FIX 10.0 - make formConfirm an addreplace-type hook 2020-10-28 17:08:09 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end 
end of dol_fiche_end
 2020-10-27 19:00:32 +01:00
Laurent Destailleur
e099507594 Fix regression 2020-10-27 18:53:03 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
fe357e17e8 Fix for ja 2020-10-27 11:00:50 +01: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
6fa174d13f
Merge pull request #15051 from laudeco/feature/11878_select_bank_account 
11878 - select the only bank account
 2020-10-25 14:56:08 +01:00
Laurent Destailleur
dbf626b92b
Update html.form.class.php 2020-10-25 14:55:52 +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
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
c6cee2f96f
Merge pull request #15128 from frederic34/patch-11 
doxygen
 2020-10-25 14:34:15 +01:00
Laurent Destailleur
bb147d2599 FIX #15140 2020-10-25 14:12:34 +01:00
Maxime Kohlhaas
bedfb7ac8d Fix BOM position field 2020-10-24 19:19:06 +02:00
Laurent De Coninck
1d62834b2c
use the second version for default bank account 2020-10-24 17:15:48 +02:00
Frédéric FRANCE
3d3b530357
doxygen 2020-10-23 22:24:20 +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
50da1cd95e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-23 17:33:57 +02:00
Laurent Destailleur
cf4ea4168d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2020-10-23 17:33:14 +02:00
Laurent Destailleur
f00fa93903 FIX check on required field when updating 1 extrafields. 2020-10-23 17:31:17 +02:00
Laurent Destailleur
377c44eeab
Merge pull request #14656 from OPEN-DSI/v10-fix-extrafields-select-required 
FIX no empty value in required extrafield
 2020-10-23 17:29:12 +02:00
Laurent Destailleur
572637b726 Enhance update of 1 extrafield (simple update instead of delete+insert) 2020-10-23 15:31:13 +02:00
jpb
47351c3cb3 Fix : stickler-ci 2020-10-23 13:55:55 +02:00
jpb
63c82b47fe Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate 2020-10-23 12:27:14 +02:00
jpb
1ecff0a608 add list and crud 2020-10-23 11:58:25 +02:00
Laurent Destailleur
81543df5e4 Fix warnings 2020-10-23 04:24:54 +02:00
Laurent Destailleur
0a1e49447d
Merge pull request #15108 from frederic34/patch-4 
Update cproductnature.class.php
 2020-10-23 04:07:03 +02:00
stickler-ci
5638a49774 Fixing style errors. 2020-10-22 22:23:03 +00:00
Frédéric FRANCE
43bb812260
Update cproductnature.class.php 2020-10-23 00:22:34 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00