Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 04:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
65,465 Commits 36 Branches 190 Tags
8e58ef5ce2725e6757ea0fe5cb15014928d6affa
Commit Graph

13457 Commits

Author SHA1 Message Date
Laurent Destailleur
ec66bde3c9 Add option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-02-10 12:15:24 +01:00
Laurent Destailleur
2315997aad CSS enhancement 2018-02-10 00:00:12 +01:00
Laurent Destailleur
e984d7df9f NEW Add total of time spent in timespent page at top of page too. 2018-02-09 23:52:43 +01:00
Laurent Destailleur
633dc507fe NEW Use a css style for weekend in time spent 2018-02-09 20:11:32 +01:00
Laurent Destailleur
eb8664e649 NEW Can export leave requests 2018-02-09 16:08:28 +01:00
atm-ph
b074f580db Fix can't update $nblignes on beforePDFCreation if we update $object->lines 2018-02-08 16:59:17 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
dde631c97b Merge pull request #8149 from frederic34/patch-8 
NEW Add delivery_time_days of suppliers in export profile
 2018-02-08 14:09:33 +01:00
Laurent Destailleur
42a0dd7854 Merge pull request #8148 from frederic34/patch-7 
Update pdf_rouget.modules.php
 2018-02-08 14:07:55 +01:00
Laurent Destailleur
ab21769aa2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-08 12:58:47 +01:00
Laurent Destailleur
879308e0ef Fix responsive 2018-02-08 10:15:53 +01:00
Laurent Destailleur
507328d83a Fix syntax error 2018-02-07 17:50:16 +01:00
Laurent Destailleur
37afc58c48 The module ExpenseReport use numbering rules that you can setup (like 
other modules do). If you need to keep the hard coded numbering rule of
expenses report used in 6.0, just add constant
EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1.
 2018-02-07 17:45:13 +01:00
Laurent Destailleur
cb5d0b1677 Fix compatibility option EXPENSEREPORT_USE_OLD_NUMBERING_RULE 2018-02-07 17:43:16 +01:00
Laurent Destailleur
510fc22172 Fix expense report 2018-02-07 17:01:14 +01:00
jh z
131eed97a1 New: Add a tab of Docments to expedition module 2018-02-07 22:56:14 +08:00
Laurent Destailleur
d8872a412b Fix numbering for expense report 2018-02-07 15:52:57 +01:00
atm-ph
6254e20c67 Fix position if module use pdf hook "linkedobjects" 2018-02-07 15:41:39 +01:00
Frédéric FRANCE
1cff0593f8 Update modProduct.class.php 2018-02-07 10:42:21 +01:00
Frédéric FRANCE
c39f5ed26a Update pdf_rouget.modules.php 2018-02-07 09:00:47 +01:00
Laurent Destailleur
b95cd2f383 Fix translation 2018-02-06 19:33:31 +01:00
Laurent Destailleur
69196dc52c Fix menu not visible with auguria module 2018-02-06 18:22:04 +01:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
565372eaab Fix param showsize. Fix extrafields field too long 2018-02-06 10:34:29 +01:00
Laurent Destailleur
930d58ab96 Fix import supplier product price vat 2018-02-06 10:03:06 +01:00
Laurent Destailleur
22b95b1c43 Simpler top menu code 2018-02-05 23:06:48 +01:00
Laurent Destailleur
eedbcbdc40 Merge branch 'develop' into patch-2 2018-02-05 15:43:18 +01:00
Laurent Destailleur
6291cb4cbe Update commonobject.class.php 2018-02-05 15:41:34 +01:00
Laurent Destailleur
9a0dca57af Update commonobject.class.php 2018-02-05 15:40:18 +01:00
Laurent Destailleur
4cfec30f93 Start to work on PDF template for timesheet 2018-02-05 15:35:55 +01:00
Laurent Destailleur
51847dfa8a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2018-02-05 15:34:50 +01:00
Laurent Destailleur
9731a7fedc Code for update more similar than insert 2018-02-05 15:31:40 +01:00
Laurent Destailleur
aeeb787bae Merge pull request #8135 from atm-arnaud/FIX_contact_order_by_name 
FIX order contactlist on Thirdparty by name
 2018-02-05 15:14:17 +01:00
arnaud
3c816acb05 FIX order contactlist on Thirdparty by name 2018-02-05 15:06:28 +01:00
Laurent Destailleur
72f6b2956a Fix: pagination into belugo template 2018-02-05 14:31:39 +01:00
Laurent Destailleur
775085e1b8 Border of comment box 2018-02-05 14:10:24 +01:00
Laurent Destailleur
85964e02de Fix css 2018-02-05 12:34:11 +01:00
Regis Houssin
839de65012 Fix: avoid error -1 2018-02-05 11:30:31 +01:00
Laurent Destailleur
10e7517596 Fix missing mainmenu and leftmenu into menu definition 2018-02-05 02:29:19 +01:00
Laurent Destailleur
13e71306ac Start to work on payment import 2018-02-05 02:27:48 +01:00
Laurent Destailleur
2930fc7dfa Fix missing mainmenu and leftmenu into menu definition 2018-02-05 02:27:31 +01:00
Laurent Destailleur
f229f34d05 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-05 01:34:08 +01:00
Laurent Destailleur
c02d46fb0a Fix leftmenu in menu entries 2018-02-05 01:33:44 +01:00
Laurent Destailleur
8fe773204e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 23:18:33 +01:00
Laurent Destailleur
5455ab3280 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/projet/card.php
 2018-02-04 23:17:09 +01:00
Laurent Destailleur
1a1e6adcb9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-04 13:57:07 +01:00
Laurent Destailleur
7ed66457b4 Fix ref already output 2018-02-04 13:55:18 +01:00
Laurent Destailleur
0cc6654b06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:25:00 +01:00
Laurent Destailleur
5a609215d5 Fix default value was not save at creation 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:23:04 +01:00
Laurent Destailleur
aff6bced4a Fix default value was not save at creation 2018-02-04 13:20:47 +01:00