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

418 Commits

Author SHA1 Message Date
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-06-05 18:31:53 +02:00
Gauthier
cf4308aa3b FIX : When we automatically creta an order from a proposal with workflow module, if some extrafields of propal don't exist in order object, insertExtraFields() function tries to insert extrafields in unexistant column of commande_extrafields table. 2015-06-01 11:24:30 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest 
Add new core module : REST API
 2015-05-12 19:39:37 +02:00
Juanjo Menent
97ad7ca88b Code fixes 2015-05-09 14:23:26 +02:00
Laurent Destailleur
a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
 2015-05-07 13:35:09 +02:00
Laurent Destailleur
971e23e006 Fix special_code was lost when updating line 2015-05-07 12:10:27 +02:00
Laurent Destailleur
b71e5a1025 Merge pull request #2673 from aternatik/fix_getentity 
Fix : missing getEntity calls
 2015-05-07 00:48:19 +02:00
jfefe
d62d7a2fc7 PHPCS again 2015-05-06 01:25:56 +02:00
jfefe
24bf614061 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-05-06 01:00:11 +02:00
jfefe
dbb9449ee7 Fix PHPCS 2015-05-06 00:55:42 +02:00
jfefe
289b847eb4 Add API class for orders 2015-05-05 12:42:56 +02:00
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
Frédéric FRANCE
e3f980e32c Typo 2015-05-01 18:44:27 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +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
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
e2508287bd Merge pull request #2537 from marcosgdf/cq 
Created Propal, FactureFourniseur, and Commande constants for status
 2015-04-06 12:37:52 +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
Laurent Destailleur
f38bf5a7d2 Fix extrafields were not saved when creating a supplier order 
Fix removed hooks where we must use trigger
 2015-04-03 11:00:52 +02:00
Marcos García de La Fuente
6fe803cd86 Created Propal, FactureFourniseur, and Commande constants for status 2015-04-03 05:18:47 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
16a620f926 Fix: Deadlock situation (when order were canceled, no way to make 
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
 2015-04-01 16:07:22 +02:00
Laurent Destailleur
293495467f Fix: Bad ref used into notification message 2015-04-01 11:30:48 +02:00
Marcos García de La Fuente
1b7ffd80f1 Typo 2015-03-30 03:19:20 +02:00
Marcos García de La Fuente
cc1d298f29 Merge branch 'develop' into constants 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture/class/facture.class.php
 2015-03-30 02:36:46 +02:00
Marcos García de La Fuente
3d50b41b8e Reverted $rowid instead of $id property 2015-03-23 01:40:33 +01: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
435be30047 Clean code 2015-03-17 00:35:17 +01:00
Laurent Destailleur
c65f1aea82 Merge pull request #2458 from mrsof/patch-2 
FIX : Force ref
 2015-03-17 00:23:39 +01:00
Laurent Destailleur
6d7b340cee Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang
 2015-03-16 18:30:30 +01:00
Sof
88d9f7f0f1 FIX : Force ref 
Even if you set ref in object class Commande, ref will be set to '(PROVid)' until you call 'valid' function
 2015-03-16 12:23:25 +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
Marcos García de La Fuente
094538c07b Implemented constants in Commande, Facture and Propal 2015-03-15 11:48:57 +01:00
Juanjo Menent
a63b1cf4c3 Fix: Showing system error if not enough stock of product into orders 
creation with lines

Conflicts:
	htdocs/commande/class/commande.class.php
 2015-03-14 09:57:28 +01:00
Juanjo Menent
4ae1106ffb Fix: Showing system error if not enough stock of product into orders 
creation with lines

Conflicts:
	htdocs/commande/class/commande.class.php
 2015-03-14 09:50:38 +01:00
Laurent Destailleur
7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 
atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 23:03:29 +01:00
Marcos García de La Fuente
6ec8a38e4a Removed duplicated code 2015-03-04 10:46:39 +01:00
Marcos García de La Fuente
54b6b199c7 Documented missing properties and removed redundant documentation 
(cherry picked from commit 6124f6a)
 2015-03-04 10:37:48 +01:00
Marcos García de La Fuente
e1982c54d9 Moved duplicated code to common class 2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
4c08d34bb5 Standardized $rowid as property 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
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
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00