lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,749 Commits 43 Branches 150 Tags 886 MiB
166bb5cc75
Commit Graph

8696 Commits

Author SHA1 Message Date
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
Frédéric FRANCE
ed8bfa26fb
Update cproductnature.class.php 2020-10-22 22:20:48 +02:00
Laurent Destailleur
fb7202b7f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 17:55:47 +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
Laurent Destailleur
9c9d468a18
Merge pull request #15052 from andreubisquerra/master 
TakePOS connector compatibility with templates
 2020-10-22 16:11:16 +02:00
Florian HENRY
d4fd71d0b3 fix #14649 2020-10-20 19:58:11 +02:00
Laurent Destailleur
ef182bed07 Fix browser reminder 2020-10-18 14:00:47 +02:00
jove@bisquerra.com
1283c6e095 TakePOS connector compatibility with templates 2020-10-18 09:29:33 +02:00
Laurent De Coninck
d2e2cad028
select by default, remove the show empty everywhere the field is required 2020-10-17 21:15:52 +02:00
Laurent Destailleur
547b3602cc FIX refresh of tasks combo must use an ajax page not a full html page 2020-10-17 21:14:19 +02:00
Laurent De Coninck
cea7fd6894
select the only bank account 
When there is only one bank account in the dropdown of the bank account,
select it by default.

[see: #11878]
 2020-10-17 20:45:37 +02:00
Laurent Destailleur
f2fafe04b6 Update doc 2020-10-17 18:16:03 +02:00
Laurent Destailleur
7b20e703ee Clean code 2020-10-17 15:53:31 +02:00
Laurent Destailleur
20b6d3828e NEW Show image of user in the combo select of users 2020-10-17 13:27:39 +02:00
Laurent Destailleur
5df1218d9f Enhance page to setup email templates 2020-10-17 12:59:22 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
Laurent Destailleur
67785887fd
Merge pull request #15035 from andreubisquerra/master 
Change the tag char for security reasons in 'Receipt Printer' module
 2020-10-16 17:20:04 +02:00
Laurent Destailleur
e74b833d7f Look and feel v13 2020-10-16 15:40:52 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
Laurent Destailleur
5905d3be64 Fix phpcs 2020-10-16 00:06:26 +02:00
jove@bisquerra.com
f90b236e0f Change the tag char for security reasons in 'Receipt Printer' module 2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType 
NEW : Nature of product is now a dictionay
 2020-10-15 21:07:42 +02:00
Laurent Destailleur
9bbb471b4f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/loan/card.php
 2020-10-15 20:51:30 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit 
tests.
 2020-10-15 19:36:08 +02:00
Laurent Destailleur
844c4dec4d css 2020-10-15 13:16:17 +02:00
stickler-ci
05ac7c91c7 Fixing style errors. 2020-10-14 16:25:23 +00:00
Florian HENRY
4fd32325d6 cast int 2020-10-14 18:22:55 +02:00
Florian HENRY
bcb98d1d67 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:34 +02:00
Laurent Destailleur
c079076488
Merge pull request #15010 from bafbes/abb120147 
fix:allow const files loading from modules inside custom folders
 2020-10-14 17:39:08 +02:00
Florian HENRY
fd1fa1c777 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Florian HENRY
a2ef7bc61e add select 2020-10-14 14:26:40 +02:00
Laurent Destailleur
a0b17635fd NEW When creating a user from a member linked to a thirdparty, you can 
decide if it is an internal or external (default) user.
 2020-10-14 14:02:07 +02:00
Laurent Destailleur
7838ca32ba Fix sql injection reported by Jason Nordenstam 2020-10-14 01:52:53 +02:00
bahfir abbes
4ee6cedbe6 Option d’Activation du fichier global de configuration. 2020-10-13 23:33:25 +01:00
Laurent Destailleur
d3b6ada4eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-13 15:08:53 +02:00
Laurent Destailleur
bc6b5d919a Better responsive 2020-10-13 10:51:51 +02:00
Laurent Destailleur
7c67dbf6d5 Better responsive 2020-10-13 10:05:47 +02:00