lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

389 Commits

Author SHA1 Message Date
Laurent Destailleur
166082d3cb Debug v16 2022-06-03 12:53:55 +02:00
Laurent Destailleur
16fac44e9f
Update products.lang 2022-05-08 19:14:32 +02:00
GregM
885324629f commit resolve conflict 2022-05-04 17:10:39 +02:00
GregM
d2bf2fdb98 update massaction langs & script 2022-05-04 16:53:57 +02:00
Laurent Destailleur
1fd004d2a7
Merge pull request #20135 from atm-quentin/NEW_inventory_pmp_hidden_conf 
New hidden conf to manage pmp on inventory
 2022-04-14 22:42:35 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge 
can merge products
 2022-04-07 15:02:03 +02:00
Quentin VIAL-GOUTEYRON
c7e8a2bd8f Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-28 16:04:12 +02:00
Laurent Destailleur
94224e9275
Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices 
NEW option update prices on proposal cloning
 2022-03-23 16:49:12 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
lvessiller
a4508e656c NEW pull develop 2022-03-17 12:20:15 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Laurent Destailleur
caf999aa1f Fix scanner in inventory. Fix button must not be clicable if disabled. 2022-03-17 00:12:05 +01:00
Laurent Destailleur
4b3b9ed66b Look and feel v15 2022-03-14 11:43:58 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Laurent Destailleur
2279674f01 Trans 2022-03-09 15:58:23 +01:00
lvessiller
2561fcbb85 FIX translate update prices and add const in proposal setup 2022-03-08 10:06:57 +01:00
Quentin VIAL-GOUTEYRON
cc591b3a03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-07 10:12:17 +01:00
lvessiller
6c172d6441 NEW option update prices on proposal cloning 2022-03-03 11:58:29 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
atm-lena
dd6d0a118a Translation 2022-02-21 15:28:38 +01:00
Quentin VIAL-GOUTEYRON
879afaa59e NEW : Beginning of PMP management on inventory 2022-02-18 12:16:50 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Salvatore Chiariello
e70604c485 NEW|New #17123 added ExtraFields for Stock Mouvement 2022-01-28 14:57:36 +01:00
Laurent Destailleur
4d1e247a5c Trans 2021-12-10 12:51:00 +01:00
Laurent Destailleur
259b7dfe5a NEW: Add massaction to switch status on sale / on purchase of a product. 2021-12-06 02:48:34 +01:00
Laurent Destailleur
212001ffa7 Trans 2021-12-03 15:15:08 +01:00
Laurent Destailleur
53ab2dd109 Trans 2021-12-03 15:13:20 +01:00
Frédéric FRANCE
d9bcd27764
can merge products but experimental 2021-11-23 21:55:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Laurent Destailleur
5e26e2a71a Trans 2021-10-19 10:54:09 +02:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Laurent Destailleur
d1bfaa5256 Trans 2021-09-20 19:02:04 +02:00
Laurent Destailleur
82f66f8b0a Better label of field 2021-09-20 19:00:28 +02:00
Adrien Raze
709a297563 NEW : Allow drag and drop on kits 2021-08-30 14:45:42 +02:00
jpb
fcd485f614 merge conflict 2021-08-18 09:16:28 +02:00
Laurent Destailleur
ecb673f15c Debug default BOM on product 2021-08-16 23:02:55 +02:00
jpb
dc90a62d90 add tooltips helper on product card 2021-07-20 15:18:14 +02:00
jpb
1237c5ba55 add msg to formconfirm on propal invoice and commande 2021-07-20 14:46:56 +02:00
Laurent Destailleur
22c45fe7cc Trans 2021-07-05 15:44:11 +02:00
Laurent Destailleur
cf28fcc8cd CSS 2021-06-23 02:22:49 +02:00
Laurent Destailleur
0aef431c2a Move language keys 2021-05-02 18:56:40 +02:00
Laurent Destailleur
6c649089b8 Fix trans 2021-04-30 17:24:07 +02:00
Laurent Destailleur
35d37c75fc Fix EN Translation 2021-04-11 22:25:22 +02:00
Laurent Destailleur
7e7d393f30 Look and feel v14 2021-02-15 14:19:05 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Laurent Destailleur
31693eed21 Fix setup was not clear 2020-12-15 11:10:35 +01:00
Laurent Destailleur
fc5dc0865d Trans 2020-12-01 02:37:22 +01:00
Laurent Destailleur
d8753ea224 Fix trans 2020-11-16 14:15:54 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00