Commit Graph

4048 Commits

Author SHA1 Message Date
Laurent Destailleur
eaee252a5d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-04 12:56:12 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
fappels
e0f9605483 Fix add missing properties for trigger 2018-06-03 11:05:02 +02:00
Laurent Destailleur
be2c49d490 Fix log 2018-06-01 17:39:07 +02:00
Laurent Destailleur
0503373e31 Avoid error on screen 2018-05-31 09:49:46 +02:00
Laurent Destailleur
51b5f63ce8 Merge pull request #8880 from wdammak/patch-14
Add movement generateDocument function (mode dev)
2018-05-29 11:15:00 +02:00
Laurent Destailleur
cf5f7bf06d Update price.php 2018-05-29 10:52:55 +02:00
Laurent Destailleur
f473607249 Merge branch 'develop' into patch-15 2018-05-29 10:49:28 +02:00
wdammak
9ec6387a63 Add movement generateDocument function (mode dev) 2018-05-28 05:21:53 +01:00
Frédéric FRANCE
022d457284 loadlangs 2018-05-27 00:06:49 +02:00
Frédéric FRANCE
d986909109 loadlangs 2018-05-26 23:52:52 +02:00
Frédéric FRANCE
58e5715ac3 loadlangs 2018-05-26 17:57:30 +02:00
Frédéric FRANCE
a487cf6806 Update price.php 2018-05-26 15:15:38 +02:00
Laurent Destailleur
823936ef87 Merge pull request #8847 from frederic34/multipriceqty
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
2018-05-25 12:55:02 +02:00
Laurent Destailleur
9d407cdc03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-25 11:27:04 +02:00
Laurent Destailleur
0e6aa3def3 Fix duplicate deprecated file 2018-05-25 11:26:50 +02:00
Laurent Destailleur
cbe54e596b Merge pull request #8817 from wdammak/patch-5
Add generateDocument function to entrepot class
2018-05-25 11:08:43 +02:00
Laurent Destailleur
f416f9629e Merge pull request #8840 from all3kcis/patch-9
Add oldcopy on productlot::update()
2018-05-25 10:22:18 +02:00
Laurent Destailleur
b9fbf13eba Fix look and feel v8 2018-05-25 09:36:49 +02:00
Laurent Destailleur
23e2bb20d9 Look and feel v8 2018-05-24 12:32:04 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
Frédéric FRANCE
0623ff7667 fix logic 2018-05-24 11:56:19 +02:00
Frédéric FRANCE
8547827575 Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54 PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
All3kcis
4bfd8b5539 Add oldcopy on productlot::update() 2018-05-23 10:38:24 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
2018-05-21 23:35:09 +02:00
wdammak
5fef8c2dc1 Add generateDocument function to entrepot class 2018-05-18 14:59:42 +01:00
Laurent Destailleur
429efcc979 Merge pull request #8772 from wdammak/patch-2
Documents generes movement warehouse
2018-05-18 12:20:58 +02:00
Laurent Destailleur
b5f37b2876 Merge pull request #8811 from fappels/7.0_fix_product_vat_update_errorhandling
Fix product vat update error handling
2018-05-18 12:00:03 +02:00
fappels
90d2ccc79c Fix product vat update error handling
Product vat update does not show update error if update result negative.
2018-05-17 21:29:15 +02:00
wdammak
c0e5132108 Documents generes movement warehouse 2018-05-09 15:07:11 +01:00
wdammak
e62426546d Add Documents generes 2018-05-09 15:02:46 +01:00
Laurent Destailleur
546da0ceda Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/modules/modStock.class.php
	htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
44cb60e61d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-05 13:25:00 +02:00
Laurent Destailleur
f6ca1eb624 Fix permission name 2018-05-05 13:24:46 +02:00
Laurent Destailleur
634e58b7c9 Look and feel v8 2018-05-04 18:24:00 +02:00
fappels
db76fd7895 Fix delete all product variants of a parent product
User object missing
2018-05-02 22:33:23 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Laurent Destailleur
aafab12f4b Debug API for ticket module 2018-04-29 18:06:31 +02:00
Laurent Destailleur
19d15c79dd Merge pull request #8673 from frederic34/variantonservice
NEW Module variant supported on services
2018-04-27 10:01:28 +02:00
Laurent Destailleur
90723357c4 Look and feel v8 2018-04-24 13:50:05 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not
visible.
2018-04-24 11:37:57 +02:00
Frédéric FRANCE
5f4e2dc565 variant on services 2018-04-24 11:01:17 +02:00
Frédéric FRANCE
657fa48c3f Update api_products.class.php 2018-04-23 15:31:55 +02:00
Laurent Destailleur
ac89951acd Merge pull request #8647 from fmarcet/develop
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
411949a6bb Optimize constructors 2018-04-21 15:08:46 +02:00
Laurent Destailleur
394b988a4e FIX key in getEntity for supplier proposals 2018-04-21 14:41:31 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00