lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
81,540 Commits 43 Branches 150 Tags 886 MiB
b317530b39
Commit Graph

71651 Commits

Author SHA1 Message Date
Laurent Destailleur
b317530b39 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 15:23:48 +01:00
Laurent Destailleur
c692650430 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 15:23:40 +01:00
Laurent Destailleur
310e65b93c Work on MRP cration 2019-12-02 15:23:21 +01:00
Laurent Destailleur
66571df449 Fix remove a link that is private 2019-12-02 15:19:14 +01:00
Laurent Destailleur
6f7343b14f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 11:01:26 +01:00
Laurent Destailleur
6d81bc77cb Fix look and feel v11 2019-12-02 11:00:09 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
b678100c8d Update website temp 2019-12-02 09:19:20 +01:00
Laurent Destailleur
32a539a8c0 Update website templates 2019-12-02 09:19:05 +01:00
Laurent Destailleur
7908e0cd26 Fix crop for MO 2019-12-02 08:46:59 +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
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
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
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
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
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
Norbert Penel
073274072f
FIX #12558 2019-12-01 10:47:25 +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
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