Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
60,834 Commits 36 Branches 189 Tags
c16cb15ce30ba644f33f01e32b273677007c8044
Commit Graph

3734 Commits

Author SHA1 Message Date
Maxime Kohlhaas
452f7be441 Fix migration for entity in remise table 2016-08-30 14:44:35 +02:00
Laurent Destailleur
98eb3fec5a Fix avoid migration when already migrated 2016-08-29 21:07:36 +02:00
Laurent Destailleur
867525cc91 Fix missing migration instructions 2016-08-29 17:50:31 +02:00
Laurent Destailleur
c49c23df3d Fix debug project categories 2016-08-29 17:30:54 +02:00
Laurent Destailleur
b8201c9f86 Fix fk_soc can be null because we can set notification for users only. 2016-08-28 23:46:12 +02:00
Laurent Destailleur
2e7e5151b7 Merge pull request #5463 from hregis/develop_origin 
New: Add entity field in llx_societe_remise_except and llx_societe_remise
 2016-08-28 12:23:04 +02:00
Laurent Destailleur
bc8e203019 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-28 01:58:43 +02:00
Regis Houssin
6e40f9e700 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/core/class/html.form.class.php

Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
 2016-08-25 10:15:26 +02:00
BENKE Charlie
777b9fe4d8 Update 4.0.0-5.0.0.sql 2016-08-23 11:28:10 +02:00
BENKE Charlie
4a2b7e1bba add link to commande fourn if resplenish 2016-08-23 11:25:14 +02:00
BENKE Charlie
8707bb04fb Update 4.0.0-5.0.0.sql 2016-08-17 16:38:02 +02:00
BENKE Charlie
5f587efc72 Update llx_facturedet.sql 2016-08-17 16:36:22 +02:00
Laurent Destailleur
15a40f6401 Fix default value of entity 2016-08-11 15:50:18 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
f1ee2bdddf Remove deprecated field 2016-08-09 13:10:34 +02:00
Laurent Destailleur
54b47d7f4f Fix edit of page in module website 
Conflicts:
	htdocs/websites/class/website.class.php
 2016-08-08 19:09:37 +02:00
BENKE Charlie
432fad6ed7 Update 4.0.0-5.0.0.sql 2016-08-07 14:22:05 +02:00
BENKE Charlie
908bf50e69 new : add user id on line for tracking feature 2016-08-07 14:16:56 +02:00
Laurent Destailleur
0e3ec5df38 Merge branch 'remove-mysql-driver' of 
https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver

Conflicts:
	htdocs/core/db/mysql.class.php
 2016-08-05 13:12:43 +02:00
Laurent Destailleur
57a542d52d Fix: we still need gd 2016-08-05 04:45:05 +02:00
Juanjo Menent
28efc3e50f NEW Add Panama datas 2016-08-03 09:45:12 +02:00
Laurent Destailleur
7dec327995 FIX #5568 2016-08-01 15:43:40 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
e0c232548e Fix theme crazy after migration 2016-08-01 10:55:41 +02:00
Laurent Destailleur
246321cd8f Fix clean orphelins of leave request logs in repair tools 
Fix date of supplier proposal missing.
 2016-07-30 18:08:07 +02:00
Laurent Destailleur
0c456add13 A more complete example of odt template 2016-07-29 16:33:31 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Laurent Destailleur
f54946bacb Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
 2016-07-28 10:10:58 +02:00
Regis Houssin
6bf655c882 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/societe/class/societe.class.php

Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
 2016-07-28 09:53:10 +02:00
Laurent Destailleur
2a28d77eeb FIX #5465 - Fix type account_parent 2016-07-27 19:53:16 +02:00
Laurent Destailleur
7e37cbb9e3 Fix resource module can't work because mandatory data not available. 2016-07-27 19:16:21 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
e747c39809 Add test on curl prerequisite. Remove test on GD lib. 2016-07-27 16:52:02 +02:00
Laurent Destailleur
eb06f56164 Fix bad version into error message 2016-07-27 16:49:00 +02:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime 
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
 2016-07-25 21:05:11 +02:00
Juanjo Menent
437a8b53ae Merge pull request #5530 from GPCsolutions/forcedinstallfixes 
Forced install fixes
 2016-07-25 10:24:33 +02:00
Marcos García de La Fuente
b1c552ee9d Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/install/mysql/tables/llx_product_attribute.key.sql
#	htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
 2016-07-24 11:54:38 +02:00
Marcos García de La Fuente
c082505021 NEW Added product attributes feature 2016-07-24 11:27:52 +02:00
Laurent Destailleur
9c89bc4095 Remove deprecated tables and code 2016-07-23 10:57:27 +02:00
Raphaël Doursenaud
1cfa26d400 Fix HTML syntax for forced install process. 
Make sure we have a space between attributes.
 2016-07-23 02:01:57 +02:00
Raphaël Doursenaud
2c000c20da Prevent PHP notice on unitialized variables. 
These variables are expected to be uninitialized when the forced install
process is not used.
 2016-07-23 02:01:49 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
058c431483 FIX The project was lost when creating the event "sent by email". Also, 
event company "create" was not tracked by default like others.
 2016-07-21 13:49:10 +02:00
Laurent Destailleur
b90ed8d677 Merge pull request #5375 from frederic34/charges 
NEW select bank and payment mode for social contrib
 2016-07-20 19:00:10 +02:00
Raphaël Doursenaud
f2a479695e New: Improved forced install process 
Tamper proofed the process by not relying on POST values for forced fields.
Disabled all fields set when $force_install_noedit is set.
Added a full-featured forced install config file template.

On the side:
Improved Dolibarr root and url detection.
Prevent install locking if install was not successful.
Added missing translation on failed administrator creation.
Better escaping of posted values.
 2016-07-20 14:22:35 +02:00
Laurent Destailleur
038526bb71 Code comment 2016-07-18 14:40:10 +02:00
Laurent Destailleur
fd7c494cb6 Add VAT for cyprus 2016-07-18 13:20:04 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Laurent Destailleur
00d80d827f To match new standard, next version will be called 5.0, 6.0, ... 2016-07-15 11:17:33 +02:00
Laurent Destailleur
f758f3466e Merge pull request #5260 from atm-gauthier/develop_add_selectbank_on_thirdparty_card 
NEW : select default bank account on thirdparty card
 2016-07-15 11:16:17 +02:00