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
|
9c954de081
|
Error management
|
2018-02-08 14:25:44 +01:00 |
|
Laurent Destailleur
|
475b89bac1
|
Merge branch 'develop' into new_order_min_amount
|
2018-02-08 14:20:53 +01:00 |
|
Laurent Destailleur
|
b364b2a4de
|
Fix selection of filter in agenda views
|
2018-02-06 01:16:51 +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
|
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
|
0e3d5ea9e5
|
Fix missing translation
|
2018-02-04 11:44:39 +01:00 |
|
Laurent Destailleur
|
b3df7670e9
|
Merge pull request #7999 from frederic34/propalweight
NEW display weight volume in propal
|
2018-02-03 16:58:58 +01:00 |
|
Laurent Destailleur
|
f51d6a2e50
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-02-02 10:07:16 +01:00 |
|
Laurent Destailleur
|
9c6b6f244c
|
Fix tooltip on invoice
|
2018-02-01 01:25:45 +01:00 |
|
Laurent Destailleur
|
7f9d6a5458
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
|
2018-01-31 20:25:24 +01:00 |
|
Laurent Destailleur
|
de0a8ba71f
|
Fix extrafields
|
2018-01-31 14:01:58 +01:00 |
|
Laurent Destailleur
|
d6317a26d2
|
Fix for multicompany
|
2018-01-30 15:48:09 +01:00 |
|
Laurent Destailleur
|
c67e57836e
|
Code comment
|
2018-01-29 12:58:33 +01:00 |
|
Laurent Destailleur
|
0a11d52d53
|
Fix info on email sent
|
2018-01-29 12:46:07 +01:00 |
|
Laurent Destailleur
|
f2a3c83053
|
Better error messages
|
2018-01-27 18:46:52 +01:00 |
|
Laurent Destailleur
|
ba0a96c882
|
Missing param limit
|
2018-01-26 15:37:23 +01:00 |
|
Laurent Destailleur
|
c5307e5cac
|
Fix option MAILING_LIMIT_SENDBYWEB
|
2018-01-26 15:12:40 +01:00 |
|
Maxime Kohlhaas
|
6f248a6590
|
New allow to define order min amount
|
2018-01-20 20:17:56 +01:00 |
|
Laurent Destailleur
|
fd6f0a4494
|
Fix use constant for status
|
2018-01-20 13:03:18 +01:00 |
|
Jan Giebels
|
d01a8d0508
|
Added order status =1 or =2 for overview
|
2018-01-19 11:22:25 +01:00 |
|
Laurent Destailleur
|
59eefa46e6
|
Fix duplicate search field
|
2018-01-16 18:02:36 +01:00 |
|
Laurent Destailleur
|
1f2d275ef2
|
Fix conditions of some fields
|
2018-01-13 17:21:56 +01:00 |
|
Laurent Destailleur
|
53b36435d0
|
Fix on smartphone
|
2018-01-12 20:50:18 +01:00 |
|
Laurent Destailleur
|
a44363ce3d
|
Fix responsive
|
2018-01-12 14:41:57 +01:00 |
|
Laurent Destailleur
|
43d560830c
|
Fix on old php
|
2018-01-10 13:20:43 +01:00 |
|
Laurent Destailleur
|
9f79ad800b
|
Fix price per quantity
|
2018-01-09 14:20:47 +01:00 |
|
Laurent Destailleur
|
42e659e26c
|
Fix link for online payment
|
2018-01-08 13:21:04 +01:00 |
|
Laurent Destailleur
|
1e438b7ebd
|
Fix travis and return of api that change status
|
2018-01-05 02:01:57 +01:00 |
|
Laurent Destailleur
|
d7837f8800
|
Try fix for #7778
|
2018-01-05 01:43:51 +01:00 |
|
Laurent Destailleur
|
45ed5c20ea
|
Merge pull request #8011 from frederic34/patch-1
Update card.php
|
2018-01-04 23:57:53 +01:00 |
|
Laurent Destailleur
|
dd8e7d657f
|
Update card.php
|
2018-01-04 23:57:45 +01:00 |
|
Laurent Destailleur
|
f19fb90ab0
|
Merge #8008 manually
|
2018-01-04 23:36:14 +01:00 |
|
Laurent Destailleur
|
f6007045f5
|
Fix search filters
|
2018-01-04 00:23:08 +01:00 |
|
Laurent Destailleur
|
6bc8268dc5
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2018-01-03 23:35:15 +01:00 |
|
Frédéric FRANCE
|
aaff13a984
|
Update card.php
|
2018-01-02 14:28:52 +01:00 |
|
Frédéric FRANCE
|
33f6ba19da
|
display weight volume in propal
|
2017-12-28 16:20:08 +01:00 |
|
Laurent Destailleur
|
77be56ff74
|
Merge pull request #7991 from defrance/patch-103
Add project column on proposal list
|
2017-12-28 13:03:03 +01:00 |
|
Laurent Destailleur
|
af8ebc616b
|
Update list.php
|
2017-12-28 13:02:26 +01:00 |
|
Laurent Destailleur
|
9ac99caffe
|
Merge pull request #7995 from frederic34/patch-1
Update propal.class.php
|
2017-12-28 12:51:44 +01:00 |
|
Laurent Destailleur
|
b0fefffcf8
|
Fix standardize api code
|
2017-12-28 12:44:15 +01:00 |
|
Laurent Destailleur
|
6676178435
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
|
2017-12-28 09:56:40 +01:00 |
|
Laurent Destailleur
|
3ac413084f
|
Merge branch '6.0' into 6.0
|
2017-12-28 08:46:22 +01:00 |
|
Frédéric FRANCE
|
80618d56ac
|
Update propal.class.php
|
2017-12-26 16:12:28 +01:00 |
|
Ferran Marcet
|
1c7b99d3dc
|
Fix: Missing include for Project class
|
2017-12-26 12:13:35 +01:00 |
|
BENKE Charlene
|
df884e4080
|
Add project column on proposal list
if project are not enabled we don't display it
|
2017-12-23 18:37:08 +01:00 |
|
Laurent Destailleur
|
aad0da2513
|
Fix maxi debug of APIs (clean output fields)
|
2017-12-21 16:50:18 +01:00 |
|
Laurent Destailleur
|
eab44f62b1
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
|
2017-12-21 14:35:33 +01:00 |
|