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

2484 Commits

Author SHA1 Message Date
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
phf
bd734de437 Fix bad query 2016-09-12 09:52:35 +02:00
Laurent Destailleur
ce137e3987 Fix migration when field was added without null flag. 2016-09-10 17:58:13 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
phf
7229b572dc Default entity 1 in llx_multicurrency_rate 2016-09-08 14:59:16 +02:00
phf
7917169961 Fix miss entity column in llx_multicurrency_rate 2016-09-08 14:53:59 +02:00
florian HENRY
abda9146f1 FIX : cannot add order line (if fk column is not in user they whould be 
NULL by defaut.
 2016-09-07 11:32:45 +02:00
Marcos García de La Fuente
05728075d6 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-09-06 21:06:33 +02:00
Laurent Destailleur
898bbd6031 NEW Support extrafields for expense reports 2016-09-06 13:00:32 +02:00
Laurent Destailleur
b01d1979f8 Merge pull request #5680 from aspangaro/5.0-p7 
NEW: Move Expense report menu from module to menu files (Again)
 2016-09-02 18:39:49 +02:00
Laurent Destailleur
91ede48390 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-01 11:37:40 +02:00
Laurent Destailleur
f04a3bf0c8 Fix sql error 2016-08-31 18:46:47 +02:00
Laurent Destailleur
3edb04c5b8 Fix missing migration to create entity 2016-08-31 12:54:44 +02:00
aspangaro
b5f093436e NEW: Move Expense report menu from module to menu files (Again) 2016-08-30 21:43:17 +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
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
Juanjo Menent
28efc3e50f NEW Add Panama datas 2016-08-03 09:45:12 +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
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
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
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime 
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
 2016-07-25 21:05:11 +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
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
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
frederic34
2de3d4ec7b Merge remote branch 'upstream/develop' into charges 
Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-07-15 10:41:56 +02:00
Laurent Destailleur
74f28b3861 NEW Complete table llx_ecm_files with field generated_or_uploaded 2016-07-15 10:38:13 +02:00