Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 07:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
51,418 Commits 37 Branches 191 Tags
c47e18b7e2bc8a7e20165a1d0a825af61fca80ff
Commit Graph

1312 Commits

Author SHA1 Message Date
Laurent Destailleur
b57f0a0e5f Fix option to use old path for product is for compatibility if user come 
from 3.6 or lower. Must not be enabled on 3.7.0 or +.
 2015-06-05 18:32:49 +02:00
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
Regis Houssin
e78dba809b Fix: PRODUCT_USE_OLD_PATH_FOR_PHOTO use entity 0 for multicompany 
Fix: use encrypt/decrypt with llx_const for experimental encryption of
sensitive data
 2015-06-05 09:42:21 +02:00
Laurent Destailleur
7c3f94d350 Merge pull request #2955 from hregis/develop_origin 
Fix: use encrypt/decrypt with llx_const for experimental encryption in
 2015-06-05 09:35:25 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
Regis Houssin
e1136b4758 Fix: use encrypt/decrypt with llx_const for experimental encryption in 
database of sensitive data
 2015-06-04 15:50:31 +02:00
Laurent Destailleur
c9d63238ca Add fields at bank account description to manage corretly sepa 
generation.
 2015-06-01 13:19:02 +02:00
Laurent Destailleur
e9687cbc4f Fix the amount for entry price must use the format dedicated to amount. 2015-05-31 18:23:11 +02:00
Laurent Destailleur
19694710b2 Keep this constant visible 2015-05-31 12:24:23 +02:00
Laurent Destailleur
7a0ec2d831 Prototype with datatables works now also ith jmobile. 
Add field fifo and lifo into product table.
 2015-05-30 23:56:42 +02:00
Marcos García de La Fuente
460a2ec2ab Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/categories/categorie.php
	htdocs/comm/prospect/list.php
 2015-05-25 15:09:46 +02:00
abb
4e48f24507 added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in Database 2015-05-23 15:12:24 +01:00
Raphaël Doursenaud
fc88df9ddf Fixed typo 2015-05-21 16:33:38 +02:00
Raphaël Doursenaud
38a9f6edae Drop deprecated fields 
Fix #2870
 2015-05-21 16:32:46 +02:00
Laurent Destailleur
4a70bb7acf Work on generic usage of get_exdir. 2015-05-18 23:04:49 +02:00
Laurent Destailleur
15c355efc9 A ref field must never be null. 2015-05-18 22:31:14 +02:00
Laurent Destailleur
36d164f779 Add field gender into table of user. 2015-05-17 23:43:57 +02:00
Laurent Destailleur
851007f1a8 Prepare database to manage recurring events 2015-05-17 20:12:49 +02:00
Juanjo Menent
1d3bcc1d81 Insert option to use old system storage photos only if the first 
installation was done with a version < 3.7.0

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-05-16 16:19:51 +02:00
Marcos García de La Fuente
e2b2c1c8bd Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-05-15 12:30:03 +02:00
Laurent Destailleur
c33cbefad2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 11:16:29 +02:00
Laurent Destailleur
49a13f5e72 Debug of module expense report 2015-05-15 03:52:29 +02:00
Juanjo Menent
d65721bb20 Insert option to use old system storage photos only if the first 
installation was done with a version < 3.7.0
 2015-05-13 20:34:57 +02:00
Laurent Destailleur
43b5209192 NEW Clean code into salary module, debug and add indexes 
NEW Can filter on user list and salary payments on user with naural
search.
 2015-05-13 08:57:39 +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
Laurent Destailleur
a94121a8c5 Add field to define picto to use for status 2015-05-12 09:42:14 +02:00
Marcos García de La Fuente
ce7ed70d74 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2015-05-10 12:23:07 +02:00
Laurent Destailleur
e6e263d13f Add field to manage reccuring events 2015-05-06 16:44:41 +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
Laurent Destailleur
b0baed83fc Prepare for email tracking 2015-05-05 21:50:48 +02:00
jfefe
4bce903c63 Add field into user table to store API key 2015-05-02 15:26:45 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Juanjo Menent
ebe1f4a74d -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-04-27 20:31:12 +02:00
Juanjo Menent
93024830f5 -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1
 2015-04-27 20:22:03 +02:00
Laurent Destailleur
414404e854 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
 2015-04-26 16:30:33 +02:00
Laurent Destailleur
025d8c2a71 Clean script migration 2015-04-25 23:22:44 +02:00
Laurent Destailleur
d47b9a759a FIX migration error 2015-04-24 00:33:02 +02:00
Laurent Destailleur
807824aaad Fix warnings 2015-04-22 21:48:59 +02:00
Laurent Destailleur
9ef809e91b Fix migration tools 2015-04-22 20:28:21 +02:00
Laurent Destailleur
5b758e0e16 Fix migration process 2015-04-22 00:17:03 +02:00
Marcos García de La Fuente
2967bc7df7 Merge branch 'develop' into units 2015-04-19 17:19:59 +02:00
Marcos García de La Fuente
7be7a770c1 Implemented units for CommandeFournisseur and FactureFournisseur 2015-04-19 16:46:24 +02:00
Laurent Destailleur
22921ad26b Fix phpunit 2015-04-19 04:43:28 +02:00
Marcos García de La Fuente
15b1f03a08 Merge branch 'develop' into commercial-name 
Conflicts:
	htdocs/comm/list.php
	htdocs/comm/prospect/list.php
	htdocs/societe/consumption.php
	htdocs/societe/soc.php
 2015-04-19 00:48:07 +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
2a8cf5f8be Fixed problem with last PR #2654 2015-04-18 22:50:40 +02:00
Laurent Destailleur
25a996644d Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into develop 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:52:02 +02:00
Laurent Destailleur
9dd73de9b0 Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:47:20 +02:00
Marcos García de La Fuente
c07e26dcac Merge branch 'develop' into fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:42:57 +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