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

54 Commits

Author SHA1 Message Date
Laurent Destailleur
0479bd5a59 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/modAdherent.class.php
 2015-05-03 13:00:39 +02:00
Laurent Destailleur
060d8a1a38 FIX Ref/label of product on contract line was not visible, nor into 
page, nor into PDF.
 2015-04-29 19:57:01 +02:00
Laurent Destailleur
83daa67cc6 FIX Description of contract line was not visible. 2015-04-29 19:15:14 +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
7be7a770c1 Implemented units for CommandeFournisseur and FactureFournisseur 2015-04-19 16:46:24 +02:00
Marcos García de La Fuente
270bca740c Merge branch 'develop' into units 
Conflicts:
	htdocs/compta/facture/fiche-rec.php
 2015-04-19 00:59:04 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
Laurent Destailleur
fb868bc8f9 We must use the dol_fiche_head and dol_fiche_end also for "create" 
forms.
 2015-04-10 10:20:51 +02:00
Laurent Destailleur
2b071a6091 NEW: For a contract line, price is no more mandatory. 2015-04-10 10:17:20 +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
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Florian HENRY
15dfd7c08d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-09 10:52:09 +01:00
Laurent Destailleur
d119397129 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-03-05 11:38:16 +01:00
fmarcet
1a02f6aa80 Fix: Masks works with thirdparty type 2015-03-04 18:18:55 +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
8e26c71fa7 Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 04:59:27 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
 2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
Florian HENRY
4ba2a1344e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-19 10:15:57 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
530186c59d PHPDoc and misc fixes for several folders 2015-02-10 13:32:00 +01:00
Laurent Destailleur
21c78cc392 Merge remote-tracking branch 'origin/3.7' into develop 2015-02-02 21:45:31 +01:00
Florian HENRY
2f59a63e5a Fix bug on contract create form propal 
and fix extrafield must be control before create object
 2015-02-02 18:03:18 +01:00
Laurent Destailleur
c19ff003ea Merge pull request #2292 from FHenry/develop_contract_line_extrafileds 
NEW: contract lines extrafileds
 2015-01-31 19:43:37 +01:00
Laurent Destailleur
275e198041 New: Selection of project use the new select2 component. 2015-01-30 19:57:38 +01:00
Florian HENRY
44a2bef29d Better syntax in contract card 2015-01-30 11:31:04 +01:00
Florian HENRY
4e14f6913a Fix contract if only service modules is enabled 2015-01-29 14:22:13 +01:00
Florian HENRY
a510a1ef5c First step add contract lines extrafields 2015-01-27 12:53:02 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
 2015-01-09 23:09:10 +01:00
Marcos García de La Fuente
7670ae46a6 Fix [ bug #1778 ] Cancel button of edit ref. supplier contract card saves changes instead of cancelling 2014-12-28 18:56:23 +01:00
Marcos García de La Fuente
1a827a87f3 Merge branch 'bug-1775' into bug-1774 2014-12-28 18:16:02 +01:00
Marcos García de La Fuente
b9d6f2a496 Fix: [ bug #1775 ] New lines can be entered after contract validation 2014-12-28 17:43:25 +01:00
Marcos García de La Fuente
d4e7a97fdb Fix: [ bug #1774 ] PHP Fatal error when creating a contract with Product module not enabled 2014-12-28 17:31:27 +01:00
Laurent Destailleur
53c2086d4b Merge pull request #2147 from csv115/develop_hook_contract 
hooks more button function on contract card
 2014-12-18 22:39:21 +01:00
csv115
bc4e6d4c7e hooks more button function on contract card 2014-12-11 16:17:37 +01:00
Laurent Destailleur
036914756b Fixed: option CONTRACT_SUPPORT_PRODUCTS not correctly supported 2014-12-11 14:15:40 +01:00
Laurent Destailleur
a4e0de0d8a Fixed: Contract must use serpis if no config set 
Fixed: Missing fetch_thirdparty.
 2014-12-11 13:12:05 +01:00
Marcos García de La Fuente
1c16a2e621 Fixed [ bug #1642 ]: add a free line in contract 2014-11-28 01:15:45 +01:00
Laurent Destailleur
44b81ad29c Merge pull request #2074 from marcosgdf/bug-1642 
Fixed [ bug #1642 ]: add a free line in contract
 2014-11-28 01:14:23 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Marcos García de La Fuente
9f73277ef2 Fixed [ bug #1642 ]: add a free line in contract 2014-11-23 13:14:54 +01:00
Laurent Destailleur
c8cd36f3e6 Fixed: ref supplier was visible with label Ref customer. 2014-11-20 10:48:55 +01:00
damien clochard
8dba0f9c85 Check PRODUIT_DESC_IN_FORM before printing the products desc 2014-11-14 00:21:39 +01:00
Laurent Destailleur
d6c1b71350 Merge pull request #1983 from atm-maxime/mkoevols 
Fixes on extrafields, product supplier prices and user / company association deletion
 2014-10-30 17:49:53 +01:00
Laurent Destailleur
132ddf65d6 Fix: several bugs into document generation (default must be used in 
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
 2014-10-27 19:37:30 +01:00
Maxime Kohlhaas
8b179c0d2a Fix : typo 2014-10-27 14:02:37 +01:00
Maxime Kohlhaas
ee4b807a5d Qual : refactoring extrafields display on objects into a single tpl file 2014-10-14 17:00:06 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00