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

2418 Commits

Author SHA1 Message Date
Laurent Destailleur
c939273fd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 13:38:56 +02:00
Laurent Destailleur
78d18185e4 Several css enhancements 2016-04-22 11:11:08 +02:00
Laurent Destailleur
a10d97cce0 NEW Can filter on status employee when building emailing from users 2016-04-22 11:09:31 +02:00
Maxime Kohlhaas
e881701968 Fix pdf generation with thirdparty 2016-04-22 09:46:47 +02:00
aspangaro
24fddaa039 Hidden old functions 2016-04-22 06:58:18 +02:00
Frédéric FRANCE
fd9fb505b9 Update printgcp.modules.php 2016-04-21 07:53:22 +02:00
Frédéric FRANCE
e1d55d280e Update printgcp.modules.php 2016-04-20 22:29:27 +02:00
Fixit Management
c3a5a7aab8 Rollback modification in this file 2016-04-19 12:54:46 +02:00
Fixit Management
ee9f1f32c1 Update conf 2016-04-19 12:43:50 +02:00
Fixit Management
5778ba0bd8 Merge remote-tracking branch 'upstream/develop' into fr_4763 2016-04-19 12:31:05 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Juanjo Menent
b5f7f962cc FIX Travis fails 2016-04-15 16:05:47 +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
357877b1fe Debug multicurrency and clean properties of some modules 2016-04-12 14:45:59 +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
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
Laurent Destailleur
b16d9a88d5 Fix regression after renaming vars 2016-04-09 19:03:34 +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
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
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
Raphaël Doursenaud
9d6efde935 Prevent sentry logging error with 3.9 update 
Since we don't ship the required libraries anymore,
if the module had been enabled before upgrade,
the code was failing making Dolibarr totally unusable.

Mitigated the issue by disabling sentry logging
if the required libraries are unavailable.
 2016-04-07 17:16:42 +02:00
Laurent Destailleur
ee53a8b1a8 NEW Can filter modules on publisher 2016-04-06 16:45:22 +02:00
Laurent Destailleur
a43a0a3f4c Debug module loan and disable non working features 2016-04-06 11:21:55 +02:00
Laurent Destailleur
f9d7c27bd2 FIX Export must use a left join to not loose lines 2016-04-05 17:17:40 +02:00
Laurent Destailleur
dd87195a07 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-04-05 17:11:54 +02:00
Laurent Destailleur
ed0ab05b93 FIX Damn, where was the project ref ? 2016-04-05 17:11:44 +02:00
Juanjo Menent
10df0e33d4 Merge pull request #4896 from grandoc/3.9 
fix a lot of beug
 2016-04-05 16:49:22 +02:00
Laurent Destailleur
2d102d3132 Bad translation key 2016-04-05 10:24:28 +02:00
Laurent Destailleur
6c87dfafae FIX Bad translation key 2016-04-05 10:12:03 +02:00
Florian HENRY
344a87f970 Merge branch 'develop' into develop_advtargetemailiing 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql
 2016-04-04 14:43:17 +02:00
Laurent Destailleur
cab1c0f5cd Merge pull request #4886 from apachler/develop 
Added functionality to get project customer contact as contact_xx tags
 2016-04-04 00:11:19 +02:00
Juanjo Menent
e8b2d6baab NEW #3510 : Working 2016-04-03 12:22:18 +02:00
Juanjo Menent
9d189b3c04 NEW #3510 : Working 2016-04-03 12:14:51 +02:00
Juanjo Menent
d55d12baeb NEW #3510 : Working 2016-04-03 11:56:31 +02:00
Florian HENRY
0ab40f11be Merge branch 'develop' into develop_advtargetemailiing 2016-04-03 11:29:17 +02:00
Laurent Destailleur
10f639507f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-04-02 15:54:51 +02:00
Florian HENRY
038b928ea4 fix travis 2016-04-01 17:09:03 +02:00
Florian HENRY
ae51321040 Debug Advance target emailing 2016-04-01 14:30:02 +02:00
Florian HENRY
304aab957b Start implement advance arget emalaing 2016-04-01 10:52:19 +02:00
Laurent Destailleur
a47accb1c3 FIX PMP is deprecated at warehouse level 2016-03-30 18:08:08 +02:00
Andreas Pachler
7eded39e28 Reworked functionality to get project contact as contact_xx tags 2016-03-30 08:34:32 +02:00
Laurent Destailleur
6188c3fced NEW Introduce a predefined job to run database backup 2016-03-29 14:52:27 +02:00
philippe grand
b3285996dc fix travis issue from commit 139dc9a7 2016-03-26 12:39:08 +01:00
Laurent Destailleur
aab7575528 FIX Problem when disabling module product or service. They both include 
same boxes, we must not disable box if the other is still active
 2016-03-26 12:28:31 +01:00