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
|
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 |
|
jh z
|
131eed97a1
|
New: Add a tab of Docments to expedition module
|
2018-02-07 22:56:14 +08: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
|
ad621f4035
|
CSS
|
2018-02-05 23:17:05 +01:00 |
|
Laurent Destailleur
|
22b95b1c43
|
Simpler top menu code
|
2018-02-05 23:06:48 +01:00 |
|
Laurent Destailleur
|
bd00b514bf
|
Delete intervention API
|
2018-02-05 20:19:00 +01:00 |
|
Laurent Destailleur
|
c7d11daed6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-02-05 17:07:57 +01:00 |
|
Laurent Destailleur
|
47cb9aef50
|
Fix: complete labels of operation if bank journal
|
2018-02-05 17:07:38 +01:00 |
|
Laurent Destailleur
|
a8ad9fb77d
|
Fix default sort order
|
2018-02-05 16:28:25 +01:00 |
|
Laurent Destailleur
|
51c754e95b
|
Merge pull request #8027 from dolibarr95/patch-34
New add fk_entrepot field in llx_societe.sql
|
2018-02-05 15:55:18 +01:00 |
|
Laurent Destailleur
|
1008c0a6f6
|
Merge branch 'develop' into patch-34
|
2018-02-05 15:55:04 +01:00 |
|
Laurent Destailleur
|
664a7c6a58
|
Merge pull request #8096 from frederic34/patch-2
Update commonobject.class.php (updated)
|
2018-02-05 15:46:16 +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 |
|
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
|
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
|
30c683ed65
|
Fix properties into tooltip
|
2018-02-05 00:36:54 +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
|
906a9eaa5a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-04 23:12:57 +01:00 |
|
Laurent Destailleur
|
dbe45d03d3
|
Fix: amount into form must be numeric without format
|
2018-02-04 23:12:19 +01:00 |
|
Laurent Destailleur
|
354fc4edd0
|
Fix: amount into form must be numeric without format
|
2018-02-04 23:06:37 +01:00 |
|
Laurent Destailleur
|
fe57cf697f
|
Fix init category selected
|
2018-02-04 14:35:38 +01:00 |
|
Laurent Destailleur
|
ec15048964
|
Fix init category selected
|
2018-02-04 14:34:31 +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 |
|
Frédéric FRANCE
|
fdd899def4
|
Merge pull request #1 from fappels/frederic34-patch-6
Fix paging when filtering
|
2018-02-04 13:25:36 +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 |
|