Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
56,821 Commits 36 Branches 189 Tags
e83bb0f50c1b0b51a587a423183563f07f46a982
Commit Graph

10470 Commits

Author SHA1 Message Date
Juanjo Menent
b5f7f962cc FIX Travis fails 2016-04-15 16:05:47 +02:00
Juanjo Menent
9f4ccfab95 FIX #3815 With higher quality 2016-04-15 15:54:51 +02:00
Juanjo Menent
c5ecc46a22 FIX #3815 With higher quality 2016-04-15 15:42:58 +02:00
Juanjo Menent
bff1ec2d80 Merge remote-tracking branch 'upstream/3.9' into develop 2016-04-15 13:49:59 +02:00
Juanjo Menent
8751f6cfa0 Merge pull request #4998 from FHenry/3.9 
FIX Hook resprint  must be printed
 2016-04-15 13:05:40 +02:00
Juanjo Menent
4446e6a36c FIX #3815 Call to undefined function local_by_date(). branch 3.8 2016-04-15 12:47:21 +02:00
Christophe Battarel
c3d4cd85f1 NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier 
order even if no supplier price defined
 2016-04-15 12:28:35 +02:00
Juanjo Menent
2d3b2c08b5 FIX #3815 Call to undefined function local_by_date(). branch 3.7 2016-04-15 10:56:03 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Laurent Destailleur
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +02:00
Florian HENRY
872c99afe9 FIX Hook resprint be printed 2016-04-12 11:35:39 +02:00
Laurent Destailleur
b60e90a7b7 NEW A module can add, into its import profiles, a sql request to execute 
at end of import. This allow to update dernormalized data after import.
 2016-04-11 18:08:03 +02:00
Laurent Destailleur
3678e05270 Mutualize code by moving getter into parent class. 2016-04-11 16:36:00 +02:00
Laurent Destailleur
03f43d7c55 Removed a TODO by moving detection of line of records of a file to 
import into the import driver.
 2016-04-11 15:19:58 +02:00
Laurent Destailleur
0e7fb80a34 FIX: We should be able to import value '0' 2016-04-11 14:56:42 +02:00
Florian HENRY
8035742779 FIX fetchAllEMailTemplate 2016-04-11 14:52:22 +02:00
Laurent Destailleur
695cccca1c Import wizard accept both id or ref into imported fields. But if the ref 
is numeric, there is no way to know if it is a ref or id. So i introduct
support of syntax id: or ref: into value of field to import to force
type.
 2016-04-11 14:44:14 +02:00
Marcos García de La Fuente
a41a80b8fe Merge branch 'develop' into oop-refactor-bankaccount-tostring 2016-04-09 23:17:09 +02:00
Marcos García de La Fuente
b9de3d5852 FIX #4442 Missing translation in Banks menu 
Close #4442
 2016-04-09 23:03:00 +02:00
Marcos García de La Fuente
b2f922291f FIX #4851 Project selector in supplier invoices shows the project label twice 
Close #4851
 2016-04-09 22:38:58 +02:00
Laurent Destailleur
63dd6d98ec Remove warnings 2016-04-09 19:53:16 +02:00
Laurent Destailleur
af4a975be2 Fix PHPCS 2016-04-09 19:50:13 +02:00
Laurent Destailleur
acf546d982 Move a not used function into a better place. 2016-04-09 19:42:34 +02:00
Laurent Destailleur
d395e8b85e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-09 19:36:48 +02:00
Scrutinizer Auto-Fixer
051ccf30a1 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 17:32:05 +00:00
Laurent Destailleur
b16d9a88d5 Fix regression after renaming vars 2016-04-09 19:03:34 +02:00
Laurent Destailleur
27217ccccd Maxi debug of supplier order workflow. 
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
 2016-04-09 18:51:09 +02:00
Laurent Destailleur
507b9a2956 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-04-09 16:00:52 +02:00
Laurent Destailleur
83644dcb93 Fix errors reported by scrutinizer 2016-04-09 15:38:15 +02:00
Laurent Destailleur
f2f672a801 FIX variable outpulang not defined 2016-04-09 15:14:27 +02:00
Laurent Destailleur
475c11ca8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-09 15:08:29 +02:00
Laurent Destailleur
724610ba5b Quality fixes reported by scrutinizer 2016-04-09 15:07:55 +02:00
Scrutinizer Auto-Fixer
c2243909e9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 13:07:33 +00:00
Laurent Destailleur
5b55af4d66 NEW Mutualize code: Use one call of function "addThumbs", when possible, 
to generate thumbs files instead of several call of "vignette" function.
 2016-04-09 14:12:21 +02:00
Laurent Destailleur
cd13c942ed FIX When editing a numeric that is not defined, we must not show 0 but 
an empty field.
 2016-04-09 10:40:56 +02:00
Laurent Destailleur
448758bbf4 Merge branch 'develop_NEW_supplier_price_reputation' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_supplier_price_reputation

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-04-08 22:01:55 +02:00
Laurent Destailleur
22bfa7a9e2 Add logs 2016-04-08 21:50:48 +02:00
Laurent Destailleur
60682f075c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-08 21:46:17 +02:00
Laurent Destailleur
234f3e331d Merge pull request #4962 from FHenry/3.8 
FIX : Template email must take care of position column
 2016-04-08 21:32:27 +02:00
Laurent Destailleur
2ffe06b1b3 Merge pull request #4965 from GPCsolutions/3.9-sentry 
Prevent sentry logging error with 3.9 update
 2016-04-08 21:31:32 +02:00
Laurent Destailleur
01e538fa78 Merge pull request #4942 from aspangaro/4.0-p16 
NEW: Move HRM area page in HRM directory
 2016-04-08 20:51:17 +02:00
Laurent Destailleur
92f1092f5c Fix remove warnings 2016-04-08 19:46:56 +02:00
Laurent Destailleur
80caf58866 FIX Default vat is not set correctly when an error occured and we use 
VAT identified by a code.
 2016-04-08 19:19:13 +02:00
Laurent Destailleur
cfcbc34972 FIX Default vat is not set correctly when an error occured and we use 
VAT identified by a code.
 2016-04-08 19:16:40 +02:00
Laurent Destailleur
b9ffc18c27 Uniformize log of supplier order. Now use the generic log feature. 2016-04-08 17:28:48 +02:00
Laurent Destailleur
f14b03a230 NEW Add more trackable events (create, submit and receive supplier 
order). So we will be able to use generic features to log what was done
with the specific table llx_commande_fournisseur_log
 2016-04-08 17:07:25 +02:00
Laurent Destailleur
1b04eabf1f Merge log with events tabs 2016-04-08 14:28:49 +02:00
Laurent Destailleur
b1c2198154 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/ajax/selectsearchbox.php
	htdocs/core/lib/price.lib.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/projet/list.php
	htdocs/societe/list.php
 2016-04-07 20:01:52 +02:00