Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
86,235 Commits 36 Branches 190 Tags
c4a7923b51a449a86f1fedc50cef32c9feb745ae
Commit Graph

20240 Commits

Author SHA1 Message Date
Laurent Destailleur
0aec776d82 Merge pull request #13737 from lecoqlibre/develop 
FIX CUnit->fetch id/rowid
 2020-04-25 13:53:16 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Marc Guenneugues
fb2759eaf6 Correct lint errors 2020-04-25 10:32:35 +02:00
Marc Guenneugues
966fedc501 ADD: New hook updateTotalPrice in commonObject update_price 2020-04-25 10:19:09 +02:00
Laurent Destailleur
5ce3174181 Look and feel v12 2020-04-25 03:31:47 +02:00
Laurent Destailleur
38f2aad0c6 Debug asset module 2020-04-25 03:19:30 +02:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109 Look and feel v12 2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Laurent Destailleur
d416edab1a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2020-04-24 22:49:59 +02:00
Maxime Lecoq
9ed7ff80a1 FIX CUnit->fetch id/rowid 2020-04-24 21:08:47 +02:00
Laurent Destailleur
fc1a1c6afe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-24 19:56:29 +02:00
Laurent Destailleur
d11dcc35c3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-04-24 19:56:19 +02:00
Laurent Destailleur
df10b86d1f FIX consistency of price w/wo vat wrong when price entered with tax 2020-04-24 19:52:34 +02:00
Laurent Destailleur
708f89c9dc Merge pull request #13732 from pstructures/new-devlelop 
Fixed Translation Issue Default Contact Address For Field
 2020-04-24 19:00:04 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
 2020-04-24 18:58:47 +02:00
gauthier
e98671e404 FIX : Access to undeclared static property: Contact::$table_element 2020-04-24 15:22:38 +02:00
stickler-ci
6d4d638ec1 Fixing style errors. 2020-04-24 12:38:46 +00:00
Tobias Sekan
05bb94cd3f fix wrong set e-mail for vCard + docu update 2020-04-24 14:12:43 +02:00
Frédéric FRANCE
1aafd4667b fix countable php7 warning 2020-04-24 11:57:23 +02:00
Matt Sidnell
dd070cc680 Update commonobject.class.php 2020-04-23 20:37:15 +01:00
Scrutinizer Auto-Fixer
548f3007cf Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-23 16:55:10 +00:00
Laurent Destailleur
00e9ed1452 Merge pull request #13716 from atm-florian/11.0 
fix: remove debug pring
 2020-04-23 18:22:18 +02:00
Laurent Destailleur
dc0978e88b Merge pull request #13720 from FHenry/dev_fix_odt 
fix: uniformize extrafeild replacemnt for ODT docs
 2020-04-23 18:22:00 +02:00
Laurent Destailleur
8401f68bde Update doc_generic_task_odt.modules.php 2020-04-23 18:21:17 +02:00
Laurent Destailleur
86be024dcc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
 2020-04-23 17:17:42 +02:00
florian HENRY
32385b75e1 travis 2020-04-23 16:18:31 +02:00
florian HENRY
7a206df96f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-04-23 16:04:58 +02:00
florian HENRY
6dafb30ee8 fix time duration substitution 2020-04-23 15:57:06 +02:00
florian HENRY
55a9aa5991 fix: missing duration odt task substitution 2020-04-23 15:55:37 +02:00
Laurent Destailleur
68e9d8463a Debug MAIN_USE_ALTERNATE_TRANSLATION_FOR variable 2020-04-23 15:52:15 +02:00
florian HENRY
882b39628f fix: uniformize extrafeild replacemnt for ODT docs 2020-04-23 15:50:42 +02:00
Laurent Destailleur
6819255b76 FIX #13650 2020-04-23 13:49:18 +02:00
florian HENRY
7972174787 remove debug pring 2020-04-23 13:44:23 +02:00
Laurent Destailleur
86928efb95 Var not defined 2020-04-23 13:35:40 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
ATM john
3f5270cf39 Remove getValue Method : usage of fetch_row is deprecated 2020-04-22 23:12:15 +02:00
ATM john
bf592489c0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools 2020-04-22 23:09:10 +02:00
Laurent Destailleur
ead78ae777 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 21:29:44 +02:00
Laurent Destailleur
de90f24bd4 Fix phpcs 2020-04-22 21:29:15 +02:00
Laurent Destailleur
3101f72b5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 18:28:59 +02:00
Laurent Destailleur
39c454d07b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
 2020-04-22 18:28:52 +02:00
Laurent Destailleur
6b8ff56c20 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2020-04-22 18:26:26 +02:00
Laurent Destailleur
80271cc852 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-22 18:24:00 +02:00
Laurent Destailleur
7bc8a70b0a FIX #13670 2020-04-22 18:23:48 +02:00
Laurent Destailleur
bbfb93bc42 Merge pull request #13690 from OPEN-DSI/new-societe-import-update-contacts 
NEW can update contact in import model
 2020-04-22 18:09:49 +02:00
Laurent Destailleur
496d8f354f Look and feel v12 2020-04-22 17:59:54 +02:00
gauthier
43f4c5ac96 FIX : model export list must be sorted by label 2020-04-22 15:29:54 +02:00