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

2512 Commits

Author SHA1 Message Date
Laurent Destailleur
1c04af2e55 Merge branch 'feature_Product_stock_subproduct_stock_independent' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-feature_Product_stock_subproduct_stock_independent

Conflicts:
	htdocs/langs/en_US/products.lang
 2015-02-24 17:23:23 +01:00
Laurent Destailleur
562348eb34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2015-02-24 15:42:28 +01:00
Laurent Destailleur
e55d3489aa Little clean of feature several price per customers 2015-02-24 12:58:43 +01:00
Laurent Destailleur
0a5c3e1fa8 Fix price must be hidden if context is not on sell 2015-02-23 23:15:41 +01:00
Alexis Algoud
29e5b89352 erase some comments 2015-02-23 12:26:27 +01:00
Alexis Algoud
0c53121553 - use incdec into virtual product definition. 
- improve screen of virtual product
 2015-02-23 12:19:19 +01:00
Alexis Algoud
72908c1fd3 Merge branch 'develop' of https://github.com/atm-gauthier/dolibarr into feature_Product_stock_subproduct_stock_independent 2015-02-23 10:51:41 +01:00
Laurent Destailleur
863094637e Merge pull request #2333 from FHenry/develop_review_productstat 
review product stats list and add filter by period
 2015-02-18 22:23:33 +01:00
Gauthier
02d59cce5a NEW : Product stock and subproduct stock are independant 2015-02-16 16:06:50 +01:00
Laurent Destailleur
e4e49e8a0b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/product.php
 2015-02-12 15:41:48 +01:00
Laurent Destailleur
206a453ce2 Solve confusion into number of order or qty into order. 2015-02-12 15:40:06 +01:00
Laurent Destailleur
c727e2b8ec Fix bad translation 
Conflicts:
	htdocs/product/stock/product.php
 2015-02-12 15:29:21 +01:00
Laurent Destailleur
6adfc6f6f4 Work on batch module. Add batch, eatby and sellby into movement table. 
Clean language files for direct print module.
 2015-02-12 15:23:31 +01:00
Laurent Destailleur
b49c8f84b6 Fix bad translation 2015-02-12 15:22:04 +01:00
Laurent Destailleur
78ba1fe86e Fix bad null management 2015-02-12 00:01:31 +01:00
Laurent Destailleur
689354f927 New: A default label is suggested for stock correction and transfer 
instead of empty string.
 2015-02-11 23:54:42 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Florian HENRY
41b0b57743 review || GETPOST("button_removefilter") 2015-02-08 11:01:27 +01:00
Laurent Destailleur
1776349a30 Merge pull request #2329 from atm-ph/deliverytime 
NEW Deliverytime
 2015-02-08 00:00:50 +01:00
Florian HENRY
eea4815312 Display amount of line not total amount 2015-02-07 20:58:18 +01:00
Florian HENRY
9a7a5b9b20 review product stats list 2015-02-07 20:36:16 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
Laurent Destailleur
553181a5d9 Fixed: Location for file storage from tab attached files was not at same 
place than from tab images.
 2015-02-06 21:26:41 +01:00
phf
12c7e52b7e [CORE] Fix : rename de la variable "delai_livraison_jours" en "delivery_time_days" (#deliverytime). 2015-02-06 16:33:58 +01:00
phf
35d41d6f7c [CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime). 2015-02-06 16:07:22 +01:00
Laurent Destailleur
556c27f834 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/stock/mouvement.php
 2015-02-04 15:15:50 +01:00
Frédéric FRANCE
0cb83c96b7 Can't use function return value in write context 
Blank page on /htdocs/product/price.php
 2015-02-02 16:23:25 +01:00
Laurent Destailleur
9c087e27d0 Fix permissions 2015-02-02 13:45:55 +01:00
Laurent Destailleur
eda2ff7f7b Fix regression in phpunit 2015-02-02 13:37:19 +01:00
Laurent Destailleur
9285897759 Fix: Load priceparser only if required. 2015-02-01 15:08:56 +01:00
Laurent Destailleur
13019f1f33 Clean code introduced by last PR. 2015-01-31 17:02:36 +01:00
Laurent Destailleur
d66d4f53a5 Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into 
frederic34-tooltip

Conflicts:
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/product/index.php
 2015-01-31 15:41:33 +01:00
Laurent Destailleur
1c7feb67ea Merge branch 'dinamic-prices-product' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/fournisseurs.php
 2015-01-31 14:53:14 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
43702cf662 New: Enhance stock management: Introduce tag to define if a subproduct 
must have stock decreased and add inventory code on stock movements.
 2015-01-30 01:51:28 +01:00
Laurent Destailleur
9850b753fa Tooltip at wrong place. 2015-01-28 19:37:09 +01:00
frederic34
e18577aa62 Tooltip and lib for file cache 2015-01-24 21:46:05 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Laurent Destailleur
b3e216b8f1 Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
 2015-01-18 15:06:54 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
85b1188593 Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php 2015-01-13 09:22:12 +01:00
Laurent Destailleur
e6d016cc48 Fixed: pmp update after makign a stock move. 2015-01-12 20:55:15 +01:00
Laurent Destailleur
31fd03790e Fixed: Prices visible into stock tab. 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-12 18:26:11 +01:00
Laurent Destailleur
1d2c8bbd4d Fixed: Prices visible into stock tab. 2015-01-12 18:16:24 +01:00
Laurent Destailleur
e24a668c52 Merge pull request #2225 from frederic34/psr2 
Psr2
 2015-01-09 22:53:06 +01:00