Maxime Kohlhaas
|
b1a8e39e7f
|
Add product line label
|
2019-12-01 17:45:01 +01:00 |
|
Frédéric FRANCE
|
41b5e82d48
|
The variable $error seems to be never defined
|
2019-12-01 16:42:18 +01:00 |
|
Laurent Destailleur
|
a6408ce9b6
|
Typo
|
2019-12-01 13:05:22 +01:00 |
|
Laurent Destailleur
|
b8ffafc603
|
Look and feel v11
|
2019-12-01 13:04:14 +01:00 |
|
Laurent Destailleur
|
408c8ccd67
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-12-01 12:51:17 +01:00 |
|
Laurent Destailleur
|
f378141fbd
|
PHPCS
|
2019-12-01 12:51:01 +01:00 |
|
Laurent Destailleur
|
3bb3643c19
|
Merge pull request #12575 from inoveaconseil/FIX#11974
Fix #11974
|
2019-12-01 12:44:36 +01:00 |
|
Laurent Destailleur
|
d900475c5d
|
Merge pull request #12571 from inoveaconseil/FIX#12473
Fix#12473
|
2019-12-01 12:42:01 +01:00 |
|
Laurent Destailleur
|
1af094af15
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-12-01 12:12:15 +01:00 |
|
Laurent Destailleur
|
5882f7eb45
|
Remove not required setup
|
2019-12-01 12:12:01 +01:00 |
|
Laurent Destailleur
|
87e81f1afd
|
Merge pull request #12583 from atm-maxime/fix_supplier_proddesc
Fix #12044 : with replenish function, use product supplier desc in order
|
2019-12-01 11:51:22 +01:00 |
|
Laurent Destailleur
|
9fb5fd65b8
|
Merge pull request #12586 from homer8173/patch-14
FIX #12558
|
2019-12-01 11:38:23 +01:00 |
|
Laurent Destailleur
|
3eec2430eb
|
Merge pull request #12585 from atm-john/develop_factoring_token_usage
Factoring token usage
|
2019-12-01 11:37:30 +01:00 |
|
Laurent Destailleur
|
aa5dff9aae
|
Merge pull request #12582 from atm-maxime/fix_remise_split
Fix #11849 : missing price2num in discount split
|
2019-12-01 10:54:30 +01:00 |
|
Laurent Destailleur
|
e1d4e14075
|
Merge pull request #12587 from atm-maxime/fix_expense_qtyupdate
Fix #12569 : update qty on expensereport prevented decimals
|
2019-12-01 10:53:57 +01:00 |
|
Laurent Destailleur
|
6388370edc
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-12-01 10:51:16 +01:00 |
|
Laurent Destailleur
|
790fdc881c
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-01 10:50:56 +01:00 |
|
Maxime Kohlhaas
|
d76608729b
|
Fix #12569 : update qty on expensereport prevented decimals
|
2019-12-01 10:50:28 +01:00 |
|
Norbert Penel
|
073274072f
|
FIX #12558
|
2019-12-01 10:47:25 +01:00 |
|
Laurent Destailleur
|
00e901ade8
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/core/lib/pdf.lib.php
|
2019-12-01 10:37:41 +01:00 |
|
Laurent Destailleur
|
bf99e8af5d
|
Fix phpcs
|
2019-12-01 10:33:55 +01:00 |
|
Laurent Destailleur
|
971add1c2f
|
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0
|
2019-12-01 10:30:33 +01:00 |
|
Laurent Destailleur
|
6bf3af5d83
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
|
2019-12-01 10:30:22 +01:00 |
|
ATM John BOTELLA
|
773f823748
|
factoring token usage
|
2019-12-01 10:20:11 +01:00 |
|
ATM John BOTELLA
|
096e50aaf6
|
add link to widget
|
2019-12-01 10:08:43 +01:00 |
|
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 |
|
Laurent Destailleur
|
8e41c8d459
|
Merge pull request #12580 from homer8173/patch-13
add label to combobox
|
2019-12-01 00:29:42 +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
|
cea5a4048b
|
Merge pull request #12545 from frederic34/initdata
restore initdata for tests
|
2019-11-30 23:28:49 +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
|
20e941c585
|
Merge pull request #12579 from atm-maxime/fix_pdf_rouget
Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME
|
2019-11-30 23:26:43 +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 |
|