lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,469 Commits 43 Branches 150 Tags 886 MiB
91bed7c014
Commit Graph

64469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
91bed7c014 FIX #8079 2018-02-08 16:13:12 +01:00
Laurent Destailleur
8240b6b5f3 travis 2018-02-08 16:00:09 +01:00
Laurent Destailleur
ea24a8a7a7 Add migration process for 8.0 into travis 2018-02-08 15:58:00 +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
2b2e68c78d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/societe/card.php
 2018-02-08 15:18:28 +01:00
Laurent Destailleur
ddcb1e2bb6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-08 15:15:44 +01:00
Laurent Destailleur
9a4de796e1
Merge pull request #8048 from ATM-Nicolas/add_margin_filters 
NEW : Add margin filters
 2018-02-08 15:15:30 +01:00
Laurent Destailleur
b56da9c11e Better balance css columns in dashboard 2018-02-08 15:11:05 +01:00
Laurent Destailleur
9c954de081 Error management 2018-02-08 14:25:44 +01:00
Laurent Destailleur
e2cabd9be7
Merge pull request #8082 from atm-maxime/new_order_min_amount 
NEW order minimum amount
 2018-02-08 14:21:29 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount 2018-02-08 14:20:53 +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
39cd63e2d4
Merge pull request #8143 from simnandez/6.0 
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
 2018-02-08 14:07:14 +01:00
Laurent Destailleur
c8ba173563 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-08 13:27:56 +01:00
Laurent Destailleur
03b10041db Fix missing contextpage 2018-02-08 13:27:43 +01:00
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
371b168db1
Merge pull request #8133 from atm-quentin/6.0 
FIX unset categorie
 2018-02-08 13:09:52 +01:00
Laurent Destailleur
3f17c92aa3
Update card.php 2018-02-08 13:09:21 +01:00
Laurent Destailleur
7ac9de6d0a
Merge pull request #8122 from frederic34/patch-6 
display search result from page 0 even we are page 350
 2018-02-08 13:07:20 +01:00
Laurent Destailleur
f5ace81116
Update myobject_list.php 2018-02-08 13:07:05 +01:00
Laurent Destailleur
2eb8a1dffd
Merge pull request #8157 from JamesZhangChina/develop-pullrequest 
NEW Add Docments'tab to expedition module
 2018-02-08 12:59:47 +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
jh z
131eed97a1 New: Add a tab of Docments to expedition module 2018-02-07 22:56:14 +08: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
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
b1f43a14bd CSS 2018-02-07 02:29:55 +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
Juanjo Menent
9b56555962 FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page 2018-02-06 18:49:29 +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