Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

214 Commits

Author SHA1 Message Date
Marcos García de La Fuente
d1f73499e9 Refactored dashboard indicator 2015-02-15 15:01:28 +01:00
Marcos García de La Fuente
530186c59d PHPDoc and misc fixes for several folders 2015-02-10 13:32:00 +01:00
Florian HENRY
5f68acfdd8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-07 20:32:54 +01:00
Laurent Destailleur
21c78cc392 Merge remote-tracking branch 'origin/3.7' into develop 2015-02-02 21:45:31 +01:00
Florian HENRY
733d2be39c readd index.html file 2015-02-02 11:13:11 +01:00
Florian HENRY
1eb73d0e49 fetch optional extrafeild lines on propal fetch 2015-01-31 13:52:23 +01:00
Florian HENRY
d39439437e Add fetch optionnals extrafield on contract lines 2015-01-31 13:50:18 +01:00
Florian HENRY
44a2bef29d Better syntax in contract card 2015-01-30 11:31:04 +01:00
Florian HENRY
a510a1ef5c First step add contract lines extrafields 2015-01-27 12:53:02 +01:00
Laurent Destailleur
c4782f960c Qual: Removed not cleand function 2015-01-22 19:47:53 +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
Marcos García de La Fuente
41e01a22a3 Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code 2015-01-17 18:58:05 +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
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Laurent Destailleur
908a95d83f Merge pull request #2211 from marcosgdf/contract-fixes 
Several Contract-related fixes
 2015-01-06 00:18:51 +01:00
Laurent Destailleur
d8d01090cd Fixed: Mark function as deprecated 2015-01-04 19:28:05 +01:00
Marcos García de La Fuente
2202380bc2 Improving ContratLigne documentation 2014-12-28 19:36:43 +01:00
Marcos García de La Fuente
7424ee1107 Improving Contrat documentation and fixed some properties usage 2014-12-28 19:28:25 +01:00
Marcos García de La Fuente
ef4d710f78 Improving CommonObject and Contrat documentation 2014-12-28 19:16:14 +01:00
Marcos García de La Fuente
ec7bc21e4c Fixed undefined variable $pu_ht 2014-12-28 19:01:39 +01:00
Marcos García de La Fuente
0b4bddd738 Fix [ bug #1779 ] Undefined variable $localtaxtx1 and $localtaxtx2 in Contrat::updateline 2014-12-28 18:57:59 +01:00
Marcos García de La Fuente
52b8bb350e Fixed Contrat::fetch not setting Contrat::date_creation and improved class doc 2014-12-28 18:10:30 +01:00
Marcos García de La Fuente
cd468b65fd Documented Contrat class 2014-12-28 17:55:21 +01:00
Laurent Destailleur
e70b6714ce Doxygen 
(cherry picked from commit 613d1b3)
 2014-12-28 17:50:38 +01:00
Marcos García de La Fuente
584be6a589 Fixed Contrat::fetch 2014-12-28 17:47:13 +01:00
Laurent Destailleur
613d1b381b Doxygen 2014-12-27 01:10:42 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
79c8980493 Fix: function at wrong place 2014-11-28 01:13:57 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
6f77dc83c4 Qual: Uniformize code and fix a ton of bugs. 2014-10-27 03:24:45 +01:00
Regis Houssin
3ddcac5ced Fix: missing $ismultientitymanaged 2014-10-06 09:12:19 +02:00
Regis Houssin
692881bf59 Fix: missing $ismultientitymanaged 2014-10-06 09:07:09 +02:00
Florian HENRY
46f673fb5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fourn/card.php
 2014-09-29 16:01:49 +02:00
Regis Houssin
4124ee6bc4 Fix: add model_pdf in fetch of contract object 2014-09-29 10:28:10 +02:00
Florian HENRY
ce145cc056 Add cache excel export on harddrive with 
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
 2014-09-29 10:16:48 +02:00
Regis Houssin
f233d4f610 New: add doc models management in contract module 2014-09-28 20:39:02 +02:00
Florian HENRY
14ca936cfc set ref_supplier for contract field 2014-09-24 10:21:26 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Marcos García de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Marcos García de La Fuente
e71dc6bc32 Created a method generateDocument for several classes 
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
 2014-09-16 12:30:37 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/theme/eldy/graph-color.php
 2014-08-15 02:28:16 +02:00