Laurent Destailleur
|
be77887477
|
Merge pull request #4628 from aspangaro/3.8-p2
Fixed: Correct problem of rights beetween tax and salaries module
|
2016-02-15 13:50:06 +01:00 |
|
aspangaro
|
d4057c3feb
|
Fixed: Correct problem of rights beetween tax and salaries module
|
2016-02-15 06:56:51 +01:00 |
|
Laurent Destailleur
|
c85b7932a9
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/core/class/commonobject.class.php
|
2016-02-15 01:18:59 +01:00 |
|
Laurent Destailleur
|
a9aab7545e
|
Merge pull request #4575 from altatof/fix_ttc_display
FIX: add missing global def for ttc column
|
2016-02-15 00:14:34 +01:00 |
|
Laurent Destailleur
|
04b390f21c
|
Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
|
2016-02-14 21:59:04 +01:00 |
|
Laurent Destailleur
|
13c85516ee
|
Doc comment
|
2016-02-14 21:58:54 +01:00 |
|
abb
|
834f0b20ae
|
fix:no transaction in this place
|
2016-02-14 20:55:09 +01:00 |
|
Laurent Destailleur
|
cc174daa13
|
Prepare 3.8.4
|
2016-02-14 20:12:47 +01:00 |
|
Laurent Destailleur
|
b091d4e897
|
Merge pull request #4586 from hregis/3.8_bug
Fix: missing signature and uniformize code between card and script
|
2016-02-14 15:50:36 +01:00 |
|
Laurent Destailleur
|
e28c3a3ee7
|
Merge pull request #4585 from grandoc/3.8
fix : Strict Standards: Only variables should be passed by reference
|
2016-02-14 12:53:09 +01:00 |
|
Laurent Destailleur
|
a022665db8
|
Merge pull request #4607 from atm-gauthier/3.8_fix_search_customer_product_price
FIX : search product in customer product prices doesn't work
|
2016-02-14 12:33:49 +01:00 |
|
gauthier
|
756b50b9d3
|
FIX : search product in customer product prices doesn't work
|
2016-02-12 12:06:23 +01:00 |
|
philippe grand
|
d02f8393dc
|
Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8
|
2016-02-10 11:43:33 +01:00 |
|
Laurent Destailleur
|
7ef0415aca
|
Small per enhancement
|
2016-02-09 15:57:24 +01:00 |
|
Regis Houssin
|
0b25601307
|
Fix: wrong object name
|
2016-02-08 12:31:40 +01:00 |
|
Regis Houssin
|
9b10f030bf
|
Fix: missing signature and uniformize code between card and script
|
2016-02-08 12:20:40 +01:00 |
|
philippe grand
|
a15d03a676
|
fix : Strict Standards: Only variables should be passed by reference
|
2016-02-08 10:06:32 +01:00 |
|
Laurent Destailleur
|
c4c7ea2f22
|
FIX Relative discount decimals are not saved
|
2016-02-08 02:49:19 +01:00 |
|
Laurent Destailleur
|
96bf59f065
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-02-05 19:21:59 +01:00 |
|
Christophe Battarel
|
7a6c7f10a6
|
FIX: add missing global def for ttc column
|
2016-02-05 19:14:40 +01:00 |
|
Laurent Destailleur
|
36a29872b1
|
Merge pull request #4559 from fmarcet/3.8
FIX: Check stock of batch on shippment
|
2016-02-05 18:41:01 +01:00 |
|
Laurent Destailleur
|
7044e62afa
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-02-05 18:37:13 +01:00 |
|
Laurent Destailleur
|
bf7181a064
|
All messages separated with , into errorsToString
|
2016-02-05 18:37:01 +01:00 |
|
Laurent Destailleur
|
02c54f4ea6
|
Merge pull request #4573 from altatof/fix_ttc
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
|
2016-02-05 18:34:45 +01:00 |
|
Christophe Battarel
|
f0aef88589
|
better fix
|
2016-02-05 13:49:19 +01:00 |
|
Christophe Battarel
|
36c7697b63
|
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in
3.7
|
2016-02-05 13:43:06 +01:00 |
|
fmarcet
|
ede4453164
|
Fix: Avoid errors when batch stock is negative
|
2016-02-05 12:59:32 +01:00 |
|
fmarcet
|
01f2180822
|
Merge remote-tracking branch 'origin/3.8' into 3.8
|
2016-02-05 12:57:43 +01:00 |
|
Laurent Destailleur
|
e9ee816826
|
Merge pull request #4561 from fappels/3.8
Fix #4556 Desired minimum stock and Stock limit for alert cleared on modify product
|
2016-02-05 11:12:31 +01:00 |
|
Laurent Destailleur
|
c9c5484805
|
Merge pull request #4570 from frederic34/patch-8
Update CMailFile.class.php
|
2016-02-05 10:58:42 +01:00 |
|
Laurent Destailleur
|
69e0f1ebc3
|
Add log to help debug
|
2016-02-04 17:55:30 +01:00 |
|
Frédéric FRANCE
|
a656607122
|
Update CMailFile.class.php
|
2016-02-04 17:12:58 +01:00 |
|
Francis Appels
|
5f7cb75518
|
Fix #4556 desiredstock and seuil_stock_alerte cleared on modify product card
removed inputs from update form also removed from update action
|
2016-02-03 19:52:09 +01:00 |
|
fappels
|
d1362951d7
|
Merge remote-tracking branch 'refs/remotes/upstream/3.8' into 3.8
|
2016-02-03 19:26:47 +01:00 |
|
fmarcet
|
6260c1ae9e
|
FIX: Check stock of batch on shippment
|
2016-02-03 11:33:13 +01:00 |
|
Laurent Destailleur
|
e22664b8cf
|
FIX #4528
|
2016-02-03 01:01:14 +01:00 |
|
Laurent Destailleur
|
015f24e80a
|
Fix php unit to work both with old and new setup
|
2016-02-02 13:01:19 +01:00 |
|
Laurent Destailleur
|
b93170b345
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-31 21:27:20 +01:00 |
|
Laurent Destailleur
|
0076512d5b
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-31 21:26:52 +01:00 |
|
Laurent Destailleur
|
1b23ede857
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2016-01-31 21:26:28 +01:00 |
|
Laurent Destailleur
|
2d0c823ffe
|
Fix bad transaction level due to code of situation invoices
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2016-01-31 20:45:06 +01:00 |
|
Laurent Destailleur
|
d9e089256e
|
Fix path to copyrighted files
|
2016-01-31 16:16:46 +01:00 |
|
Laurent Destailleur
|
dfd4d36bdf
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-30 15:58:11 +01:00 |
|
Laurent Destailleur
|
c9661ee20e
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-30 15:57:09 +01:00 |
|
Laurent Destailleur
|
3591f51918
|
Merge pull request #4480 from hregis/3.8_bug
Fix: for avoid conflict with "global $m" in memory.lib.php
|
2016-01-30 12:22:47 +01:00 |
|
Laurent Destailleur
|
b27e31b3ae
|
Merge pull request #4483 from marcosgdf/bug-4440-3
Corrected typo of PR #4444
|
2016-01-30 12:20:50 +01:00 |
|
Laurent Destailleur
|
2e7d88dffb
|
Merge pull request #4499 from fmarcet/3.7
FIX: Contrat card don't consider user permissions to show active/unactive service button
|
2016-01-30 12:12:42 +01:00 |
|
Laurent Destailleur
|
e574ebe34c
|
Merge pull request #4514 from hregis/3.8_bug2
Fix: missing field "label"
|
2016-01-30 11:57:28 +01:00 |
|
Laurent Destailleur
|
f5a4b9db31
|
Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid
FIX filter by socid if from customer card
|
2016-01-30 11:56:40 +01:00 |
|
Laurent Destailleur
|
cd58c93de6
|
FIX If option to hide automatic ECM is on, dont show menu.
|
2016-01-28 12:51:34 +01:00 |
|