2
0
forked from Wavyzz/dolibarr
Commit Graph

82240 Commits

Author SHA1 Message Date
Frédéric FRANCE
97b1bf0ea1 The variable $error seems to be never defined 2019-12-01 20:05:48 +01:00
Laurent Destailleur
5cb014435b Try better fix for #12567 2019-12-01 19:29:53 +01:00
Laurent Destailleur
af5beade41 Merge pull request #12584 from atm-john/develop_add_link_to_widget
NEW link to widget
2019-12-01 19:13:10 +01:00
Laurent Destailleur
7d802bb0e7 Merge pull request #12591 from frederic34/patch-6
The variable $letter does not seem...
2019-12-01 18:57:24 +01:00
Laurent Destailleur
91301677a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-01 18:56:46 +01:00
Laurent Destailleur
590d2cda17 Complete #12556 2019-12-01 18:56:34 +01:00
Laurent Destailleur
a0f1e76f93 Merge pull request #12556 from TobiasSekan/FixCantCreateFiles
Fix can't create files on shared folder (Windows)
2019-12-01 18:56:20 +01:00
Frédéric FRANCE
1d0900445b The variable $letter does not seem...
The variable $letter does not seem to be defined for all execution paths
2019-12-01 18:52:50 +01:00
Laurent Destailleur
7407df2fa3 Merge pull request #12590 from frederic34/patch-7
The variable $arraylist seems to be defined...
2019-12-01 18:42:03 +01:00
Laurent Destailleur
e723f8b821 Merge pull request #12588 from frederic34/patch-6
The variable $error seems to be never defined
2019-12-01 18:40:44 +01:00
Laurent Destailleur
02e2a60d0e Merge pull request #12589 from atm-maxime/fix_bom
Fix bom duration save
2019-12-01 18:40:31 +01:00
Laurent Destailleur
9754158756 Fix avoid duplicate product when searching on product with n categories 2019-12-01 18:33:57 +01:00
Frédéric FRANCE
3227f12a6e The variable $arraylist seems to be defined...
The variable $arraylist seems to be defined by a foreach iteration. Are you sure the iterator is never empty, otherwise this variable is not defined?
2019-12-01 18:27:06 +01:00
Laurent Destailleur
d5f11a5b88 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-01 18:22:28 +01:00
Laurent Destailleur
fc2fc81bb0 Fix image 2019-12-01 18:22:08 +01:00
Maxime Kohlhaas
83928b4708 Fix duration must be double(24,8) to store seconds 2019-12-01 18:19:22 +01:00
Laurent Destailleur
83f7f3a6e9 Trans 2019-12-01 18:16:51 +01:00
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