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 |
|
Laurent Destailleur
|
cb66448148
|
Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields
NEW feature hidden extrafields
|
2016-02-05 17:22:51 +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 |
|
abcnet-lu
|
a4dedfb169
|
Merge pull request #2 from Dolibarr/develop
Merge back official Dolibarr develop into my abcnet-lu fork
|
2016-02-05 13:00:43 +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
|
713050bd57
|
Fix style on payment page
|
2016-02-05 12:46:41 +01:00 |
|
Laurent Destailleur
|
e1da95871a
|
Fix bad name
|
2016-02-05 12:23:16 +01:00 |
|
Laurent Destailleur
|
062deae24c
|
Merge
|
2016-02-05 12:18:50 +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
|
04043cdb31
|
Merge pull request #4569 from abcnet-lu/raisons-socials-luxembourg
Fix: legal forms and professional IDs in Luxembourg
|
2016-02-05 10:58:03 +01:00 |
|
Laurent Destailleur
|
d66d3c0a8f
|
Merge pull request #4567 from defrance/patch-98
Add odt & pdf edition on product
|
2016-02-05 10:57:49 +01:00 |
|
Laurent Destailleur
|
0ae8a3398d
|
Fix sql error when extrafields on contact
|
2016-02-05 10:56:45 +01:00 |
|
Laurent Destailleur
|
876bc2537c
|
Merge pull request #4563 from atm-ph/fix_develop_list_socpeople
FIX list of contact
|
2016-02-05 10:55:01 +01:00 |
|
Laurent Destailleur
|
807e7b8304
|
Merge pull request #4560 from abcnet-lu/revert-develop-20160203
Fix : Add districts and cantons for Luxembourg
|
2016-02-05 10:53:51 +01:00 |
|
Laurent Destailleur
|
8e7b560cea
|
Merge pull request #4562 from atm-ph/fix_formpropal_infinite_loop
FIX infinite loop
|
2016-02-05 10:51:49 +01:00 |
|
Laurent Destailleur
|
f518ef58bb
|
Merge pull request #4557 from abcnet-lu/develop
Fix: Inverted labels of intermediary / reduced VAT rates for Luxembourg
|
2016-02-05 10:51:18 +01:00 |
|
Laurent Destailleur
|
5a2647906e
|
Merge pull request #4530 from defrance/patch-96
Add hook on contacttpl
|
2016-02-05 10:50:40 +01:00 |
|
phf
|
a8e480e392
|
FIX #3509 payment ref for suppliers
|
2016-02-04 23:15:06 +01:00 |
|
phf
|
32c0b2a9b1
|
NEW add html id/class to locate value in the DOM html
|
2016-02-04 21:05:19 +01:00 |
|
phf
|
7e3a787688
|
FIX phpcs
|
2016-02-04 19:03:25 +01:00 |
|
BENKE Charlie
|
9c896b1869
|
translations too
|
2016-02-04 18:10:28 +01:00 |
|
BENKE Charlie
|
5498b1cd5a
|
Update modSociete.class.php
|
2016-02-04 18:06:43 +01:00 |
|
BENKE Charlie
|
70e051a1bf
|
Add goods customers boxes
|
2016-02-04 18:05:35 +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 |
|
BENKE Charlie
|
87c5854382
|
just change for rerun travis cheking
|
2016-02-04 16:58:19 +01:00 |
|
abcnet-lu
|
1e9ea4f2ac
|
[#4568] Add professional IDs for Luxembourg
|
2016-02-04 16:40:49 +01:00 |
|
BENKE Charlie
|
0517435797
|
add product document generation
|
2016-02-04 16:21:27 +01:00 |
|
BENKE Charlie
|
db0c8740b9
|
add administration feature of products docs
|
2016-02-04 16:17:45 +01:00 |
|
BENKE Charlie
|
f87bfffdd9
|
add edition feacture on product element
|
2016-02-04 16:12:00 +01:00 |
|
abcnet-lu
|
490f3eaf82
|
[#4566] Add legal forms for Luxembourg
|
2016-02-04 14:41:26 +01:00 |
|
phf
|
0c05342934
|
FIX infinite loop
|
2016-02-03 22:54:48 +01:00 |
|
phf
|
7b456d23f0
|
FIX if we add extrafield on socpeople we got sql error on the list of contact
|
2016-02-03 22:53:15 +01:00 |
|
phf
|
75c4888364
|
NEW feature hidden extrafields
|
2016-02-03 22:49:43 +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 |
|
phf
|
1b552a0b3b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
|
2016-02-03 18:30:59 +01:00 |
|
fappels
|
22cfffe622
|
Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop
|
2016-02-03 17:20:38 +01:00 |
|
fappels
|
9b009ab535
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop
|
2016-02-03 17:16:03 +01:00 |
|
abcnet-lu
|
d430676e51
|
[Close] [#4558] Add districts and cantons for Luxembourg
|
2016-02-03 12:14:26 +01:00 |
|
fmarcet
|
6260c1ae9e
|
FIX: Check stock of batch on shippment
|
2016-02-03 11:33:13 +01:00 |
|
abcnet-lu
|
d65ee22529
|
[Close] [#4555] Update label of intermediary VAT rate for Luxembourg (fix inverted labels)
|
2016-02-03 09:27:48 +01:00 |
|
abcnet-lu
|
a6ab581683
|
Merge pull request #1 from Dolibarr/develop
Update my fork from original
|
2016-02-03 08:55:50 +01:00 |
|
Laurent Destailleur
|
47e2e33fb7
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
|
2016-02-03 03:27:17 +01:00 |
|