Alexandre SPANGARO
61bca50fa6
NEW: Dictionary for availability - Add column position
2020-11-05 16:56:28 +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
