Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,328 Commits 36 Branches 189 Tags
b0baed83fc94de4807d73e9b7c9b4bec3d4c818f
Commit Graph

48 Commits

Author SHA1 Message Date
Laurent Destailleur
4e04f75c66 Fix css 2015-04-27 02:33:44 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Marcos García de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
Laurent Destailleur
2d90256640 Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04 Merge pull request #2456 from marcosgdf/refactor-1 
Refactor 1
 2015-03-22 12:47:05 +01:00
Laurent Destailleur
166fda4909 Normalize class names 2015-03-17 11:26:23 +01:00
Marcos García de La Fuente
086e439543 Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
 2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/includes/tcpdi/fpdf_tpl.php
 2015-03-15 18:07:30 +01:00
Laurent Destailleur
687e3d250b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/fixdosfiles.sh
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-03-13 17:46:31 +01:00
Laurent Destailleur
a452823e1e Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility 
with 3.6
 2015-03-13 15:20:08 +01:00
Laurent Destailleur
a1567778ab Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/commande/card.php
 2015-03-06 18:51:55 +01:00
Laurent Destailleur
a169b3348e Fix show alays date fields for contract module. 
Fix select of product were lost.
 2015-03-06 14:36:22 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
b84cf4afac Renamed FactureFournisseurLine to SupplierInvoiceLine 2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Laurent Destailleur
5d1545ad1f Work on supplier order and customer extrafields 
Use templates to show/edit supplier order and invoice lines
 2015-02-27 18:05:12 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
phf
5266542bc9 [CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price). 2015-02-02 17:50:33 +01:00
phf
4408828af4 [CORE] ajouts des conditions pour le fonctionnement avec le module (#new_ask_price). 2015-01-29 12:13:06 +01:00
Florian HENRY
a510a1ef5c First step add contract lines extrafields 2015-01-27 12:53:02 +01:00
Laurent Destailleur
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
f92bc7986b Add Weighted average price as default price for buying price for margin 
calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace
with first supplier price.
 2015-01-14 10:46:50 +01:00
Laurent Destailleur
8b3faf46db Add PMP into selection of buy price. 2015-01-13 15:38:59 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
Laurent Destailleur
8d405a147f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/core/tpl/objectline_create.tpl.php
 2014-12-04 15:29:45 +01:00
Laurent Destailleur
a81c483061 Revert "Update objectline_create.tpl.php" 
This reverts commit fdac53bfca.
 2014-11-28 02:14:25 +01:00
Laurent Destailleur
9ba5e9434d Fix: W3C a label must be used if there is an "input" field only. Also it 
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
 2014-11-28 02:05:40 +01:00
BENKE Charles
fdac53bfca Update objectline_create.tpl.php 
add label tags for product mode type
 2014-11-19 18:53:33 +01:00
Laurent Destailleur
737dfab5b2 Fix: If error on add line of type "product" when creating 
proposal/order/invoice, do not show date of services.
 2014-11-16 19:12:05 +01:00
Christophe Battarel
44882f4035 improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option 2014-11-05 17:03:53 +01:00
Laurent Destailleur
80581b2908 Merge pull request #1978 from atm-maxime/3.6 
Fix : product list was wrong on supplier invoice because fourn_id is not fetched
 2014-10-30 17:56:22 +01:00
MAxime Kohlhaas
374b761fdf Fix : product list was wrong on supplier invoice because fourn_id is not fetched 2014-10-25 19:20:02 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Maxime Kohlhaas
4fd67d725a Fix bug 1588 : relative discount not working anymore 2014-10-09 13:58:43 +02:00
Laurent Destailleur
dec7fe42af Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/commande/fiche.php
 2014-07-20 15:37:50 +02:00
Laurent Destailleur
a9779ca1ff Fix: bad colspan for line with date selector 2014-07-20 02:18:21 +02:00
Laurent Destailleur
04a20d2008 - New: Enable feature developed for 3.6 we forgot to enabled: Adding 
prefix on uploaded file names. 
- New: No more dependency between contract and service module.
 2014-07-19 22:05:35 +02:00
Laurent Destailleur
b42a33b203 Fix: For contract, only services available by default. Product appears 
if option is set only.
 2014-07-19 21:14:56 +02:00
Raphaël Doursenaud
55d062784d Added labels on objectline form elements 2014-07-11 13:25:44 +02:00
Florian HENRY
b8c293fb16 $dateSelector is a paramters of formAddObjectLine, if use global it is 
reset to 0 because not declare in outer context but already exists in
the same context.
 2014-07-04 14:48:27 +02:00
Laurent Destailleur
8d8ca154f1 Fix: For supplier order/invoice, deselect product when free line is 
selected.
 2014-06-09 14:58:58 +02:00
Laurent Destailleur
5fa05ee29d Start to clean code of templates to input lines 2014-05-12 12:53:10 +02:00
Laurent Destailleur
3776f7b146 Fix: margin calculation from % when we enter a free product. 2014-05-10 20:10:59 +02:00
Laurent Destailleur
01001592e6 Finished task to merge form of free product and predefined product. 2014-05-06 18:31:39 +02:00
Laurent Destailleur
dca53accaf Fix: translation 2014-05-05 18:30:07 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new 
product (Supplier orders now use same template than customer
orders/proposal/invoices).
 2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new 
product.
 2014-05-05 14:30:08 +02:00