Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

72264 Commits

Author SHA1 Message Date
Maxime Kohlhaas
270f4c2500 Fix #12044 : with replenish function, use product supplier desc in order 2019-12-01 09:26:54 +01:00
Maxime Kohlhaas
a220d43bd6 Fix #11849 : missing price2num in discount split 2019-12-01 01:41:13 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +01:00
Laurent Destailleur
bfb8a4e8da Merge pull request #12578 from Dolibarr/revert-12577-#12482 
Revert "FIX#12482"
 2019-12-01 00:55:13 +01:00
Laurent Destailleur
0e19b94719 Merge pull request #12565 from atm-maxime/fix_ticket_from_third 
FIX #12481 : fix ticket creation from thirdparty, mission $socid var
 2019-12-01 00:47:59 +01:00
Laurent Destailleur
df5ef99f4f Merge pull request #12543 from frederic34/patch-6 
The condition $nolinesbefore is always true.
 2019-12-01 00:47:33 +01:00
Laurent Destailleur
f549c4fc9c Merge pull request #12544 from frederic34/select_produits 
Form select_produits returns void
 2019-12-01 00:47:02 +01:00
Laurent Destailleur
04be14ce52 Merge pull request #12566 from atm-maxime/fix_thirdparty_numbering 
Fix #12483 : fix thirdparty numbering module selection
 2019-12-01 00:45:40 +01:00
Laurent Destailleur
dc77b47d7f Merge pull request #12564 from atm-john/develop_fix_task_extrafield_fatal_error 
Fix Fatal error : task extrafield error
 2019-12-01 00:45:23 +01:00
Laurent Destailleur
199b0c11af Merge pull request #12572 from atm-maxime/fix_deposit 
Fix deposit line was not translated in deposit invoice
 2019-12-01 00:44:17 +01:00
Laurent Destailleur
d338a054eb Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-12-01 00:41:23 +01:00
Laurent Destailleur
a2a96f8796 # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 00:41:11 +01:00
Laurent Destailleur
3c328153bb Merge pull request #12581 from homer8173/patch-12 
add location on combobox
 2019-12-01 00:32:23 +01:00
Norbert Penel
89f57d7d3b add label to combobox 
useful for BOM, etc
 2019-11-30 23:45:24 +01:00
Norbert Penel
755417e9a9 add location on combobox 
usefull for BOM, etc
 2019-11-30 23:43:22 +01:00
Laurent Destailleur
ec67fa4877 Merge pull request #12573 from atm-maxime/fix_vat_fiscal 
Fix #11228 : VAT dates regarding fiscal year
 2019-11-30 23:30:41 +01:00
Laurent Destailleur
e62b819beb Merge pull request #12574 from homer8173/patch-10 
Default type missing for add links from module builder
 2019-11-30 23:30:05 +01:00
Laurent Destailleur
7931bfa766 Merge pull request #12568 from atm-john/develop_fix_divide_by_zero 
Fix division by zero
 2019-11-30 23:29:11 +01:00
Laurent Destailleur
47b35e9011 Merge pull request #12570 from atm-maxime/fix_margin_rights 
Fix margin rights
 2019-11-30 23:28:26 +01:00
Laurent Destailleur
09ec15c7de Merge pull request #12576 from homer8173/patch-11 
wrong object line
 2019-11-30 23:27:06 +01:00
Laurent Destailleur
c2f924f08f CSS For TakePOS 2019-11-30 23:03:30 +01:00
Maxime Kohlhaas
edb8bcb598 Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME 2019-11-30 22:58:32 +01:00
Laurent Destailleur
a352fd5a6e Revert "FIX#12482" 2019-11-30 21:00:56 +01:00
Nicolas
f2ff443641 FIX #12482 2019-11-30 20:04:27 +01:00
Norbert Penel
88c0c51396 wrong object line 
was not working with units
 2019-11-30 20:03:14 +01:00
Norbert Penel
e3fb27e3fc Default type missing for add links from module builder 
BOM links to add product don't precise the type (from common object)
 2019-11-30 19:34:22 +01:00
Laurent Destailleur
958ffa6ec8 FIX Images in TCPDF are removed by TCPDF when it should not 2019-11-30 17:19:25 +01:00
Maxime Kohlhaas
3c639772d9 Fix #11228 : VAT dates regarding fiscal year 2019-11-30 17:16:16 +01:00
Maxime Kohlhaas
558669dd88 Fix #6497 : deposit lines were not translated 2019-11-30 16:14:16 +01:00
Maxime Kohlhaas
2c165d0a61 Fix deposit date display in PDF 2019-11-30 15:53:50 +01:00
stickler-ci
a13b2267aa Fixing style errors. 2019-11-30 14:22:25 +00:00
Maxime Kohlhaas
916954b301 Fix #12371 : access rights on contacts 2019-11-30 14:48:05 +01:00
Maxime Kohlhaas
9095482113 Fix margins access + menu display 2019-11-30 14:47:48 +01:00
Nicolas
fd7a18c26f FIX #12473 2019-11-30 12:49:31 +01:00
Laurent Destailleur
b6c88d3c24 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-11-30 12:04:01 +01:00
Laurent Destailleur
fe37983b06 Fix inversion of mime type and mime file name 2019-11-30 12:02:05 +01:00
Laurent Destailleur
1c58cc5031 Clean doc 2019-11-30 10:59:47 +01:00
Laurent Destailleur
f98f50e410 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-11-30 10:55:46 +01:00
Laurent Destailleur
aedec91b5d Fix phpcs 2019-11-30 10:55:29 +01:00
ATM John BOTELLA
b7d39b610b Fix divided by zero 2019-11-30 10:08:55 +01:00
Maxime Kohlhaas
e0487ea861 Fix #12483 : fix thirdparty numbering module selection 2019-11-30 01:37:15 +01:00
Laurent Destailleur
30f1ce0d17 Merge pull request #12549 from frederic34/patch-11 
The variable $db seems to be never defined.
 2019-11-30 01:26:56 +01:00
Laurent Destailleur
d43c1d3904 Merge pull request #12547 from frederic34/patch-7 
The property ownerid does not exist on ActionComm
 2019-11-30 01:25:51 +01:00
Laurent Destailleur
6944b67b1e Merge pull request #12548 from frederic34/patch-8 
functions return void
 2019-11-30 01:25:04 +01:00
Laurent Destailleur
b0e005bcee Merge pull request #12550 from frederic34/patch-13 
missing $conf
 2019-11-30 01:21:58 +01:00
Laurent Destailleur
68b36411b4 Merge pull request #12551 from frederic34/patch-14 
The property table_element_date does not exist on Project
 2019-11-30 01:20:41 +01:00
Laurent Destailleur
35b4318cee Merge pull request #12552 from frederic34/patch-15 
$head was never initialized
 2019-11-30 01:16:40 +01:00
Laurent Destailleur
557ea14334 Merge pull request #12555 from frederic34/patch-19 
avoid placeid to be string or string[]
 2019-11-30 01:15:53 +01:00
Maxime Kohlhaas
2a3012f12d Fix #12481 : fix ticket creation from thirdparty, mission $socid var 2019-11-30 01:15:47 +01:00
Laurent Destailleur
ce78a7665d Merge pull request #12554 from frederic34/patch-18 
doxygen
 2019-11-30 01:14:35 +01:00