Commit Graph

64333 Commits

Author SHA1 Message Date
Laurent Destailleur
071436caba
Merge pull request #8144 from hregis/7.0_bug
Fix: wrong id name
2018-02-08 13:19:54 +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
c988d3f1cc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/compta/facture.php
2018-02-08 12:53:26 +01:00
Laurent Destailleur
2e3bb4a585 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-08 12:48:48 +01:00
Laurent Destailleur
414093f94f
Merge pull request #8155 from atm-ph/fix_6.0_pdf_writelinkedobjects_position
Fix position if module use pdf hook "linkedobjects"
2018-02-08 12:48:37 +01:00
Laurent Destailleur
8156374005 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-08 12:45:30 +01:00
Laurent Destailleur
a26bb2d884 FIX #8151 2018-02-08 12:41:31 +01:00
Laurent Destailleur
879308e0ef Fix responsive 2018-02-08 10:15:53 +01:00
Regis Houssin
70a65b89eb Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug 2018-02-08 08:52:45 +01:00
Laurent Destailleur
729cf20df7 Fix css 2018-02-07 20:53:13 +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
Laurent Destailleur
8dd7d69294 Fix commit 2018-02-07 16:04:31 +01:00
Laurent Destailleur
413331c7dd Fix travis 2018-02-07 15:54:58 +01: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
Laurent Destailleur
852c4fc033 Fix context of filter not lost 2018-02-07 12:08:25 +01:00
Laurent Destailleur
b95cd2f383 Fix translation 2018-02-06 19:33:31 +01:00
Regis Houssin
8b7f40e15b Fix: wrong id name 2018-02-06 19:29:16 +01:00
Laurent Destailleur
5e7d172a58 Fix look and feel v7 on ref popup 2018-02-06 19:16:15 +01:00
Laurent Destailleur
9962d36dbc Fix translation 2018-02-06 18:39:11 +01:00
Laurent Destailleur
490a1bd08d Fix label 2018-02-06 18:36:47 +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
bf7ae08c48 sync transifex 2018-02-06 01:17:50 +01:00
Laurent Destailleur
b364b2a4de Fix selection of filter in agenda views 2018-02-06 01:16:51 +01:00
Laurent Destailleur
f251113f69 Fix accounting module with multicompany 2018-02-06 01:00:35 +01:00
Laurent Destailleur
074f4a3b46 Fix class not found when selecting project ref in lists 2018-02-06 00:34:14 +01:00
Laurent Destailleur
b063c19084 Fix: object project not defined 2018-02-06 00:19:40 +01:00
Laurent Destailleur
2fbe4637ac Fix bad filter link 2018-02-05 23:05:37 +01:00
Laurent Destailleur
6d52676600 Prepare 7.0 2018-02-05 20:50:15 +01:00
Laurent Destailleur
180f9918c7 Transifex sync 2018-02-05 20:43:50 +01:00
Laurent Destailleur
c2590b9c7e Fix: complete labels of operation if bank journal
Conflicts:
	htdocs/compta/tva/class/tva.class.php
2018-02-05 17:10:18 +01:00
Laurent Destailleur
ad384a9992 Fix default sort order 2018-02-05 17:08:47 +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
Laurent Destailleur
2d4624a1be
Merge pull request #8134 from hregis/6.0_multicompany
Fix: avoid error -1
2018-02-05 15:13:31 +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
90bc859048 Fix trans 2018-02-05 02:34:49 +01:00
Laurent Destailleur
10e7517596 Fix missing mainmenu and leftmenu into menu definition 2018-02-05 02:29:19 +01:00
Laurent Destailleur
c02d46fb0a Fix leftmenu in menu entries 2018-02-05 01:33:44 +01:00
Laurent Destailleur
30c683ed65 Fix properties into tooltip 2018-02-05 00:36:54 +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