Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
58,483 Commits 36 Branches 189 Tags
fce8e08b51a7d6a0160c925778e0e4458cd45330
Commit Graph

103 Commits

Author SHA1 Message Date
Laurent Destailleur
f241bfefd0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 20:20:59 +01:00
gauthier
6cecab4c92 FIX : forgottent fk_unit field on llx_supplier_propaldet 2017-03-22 16:43:12 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Laurent Destailleur
5871d59db9 Fix error "Invalid default value for 'date_price'" 2017-03-18 15:25:49 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b FIX The vat rate line used when adding a predefined product was wrong if 
there is several vat line with same rate.
 2017-03-04 22:27:44 +01:00
Laurent Destailleur
832c91417a Fix the default_vat_code was not correctly saved and shown on the 
product price.
 2017-03-04 19:16:09 +01:00
Laurent Destailleur
bef5f2c236 FIX #6465 2017-03-03 15:06:17 +01:00
Laurent Destailleur
28ad50e059 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/suppliers.lang
 2017-03-03 14:31:35 +01:00
Laurent Destailleur
8487f0fc96 Fix missing setup of new option 2017-03-01 11:18:11 +01:00
Laurent Destailleur
072fa9987b Update 4.0.0-5.0.0.sql 2017-02-08 16:47:27 +01:00
Andreas Pachler
c45b40075d fixed typos 2017-02-08 12:55:03 +01:00
Andreas Pachler
ae3ace7e94 added additional payment terms often needed in Austria 2017-02-08 12:46:42 +01:00
Laurent Destailleur
b24f244f67 Merge pull request #5533 from marcosgdf/prod-attr 
Feature Request: NEW Added product attributes feature
 2017-02-08 11:20:33 +01:00
Laurent Destailleur
b0ee04c079 FIX #6379 2017-02-07 01:13:50 +01:00
Laurent Destailleur
2d77cb2da5 FIX #6379 2017-02-07 00:54:54 +01:00
Marcos García de La Fuente
5669f734b8 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/comm/propal/card.php
#	htdocs/commande/card.php
#	htdocs/compta/facture.php
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/commande/card.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-12-24 21:39:40 +01:00
Laurent Destailleur
46a8041143 Clean orphelins 2016-12-23 15:22:25 +01:00
Laurent Destailleur
71d2ee3aa9 Fix default of a column 2016-12-12 20:30:21 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
Laurent Destailleur
495ba00cb6 Fix: Slurp, database corruption due to missing unique key on main key. 2016-12-02 14:21:46 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00
Marcos García de La Fuente
cf0ee36150 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-11-27 18:10:01 +01:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
florian HENRY
7bf6ad49da Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-11-14 12:23:17 +01:00
florian HENRY
37a9f15fb4 FIX : increase size of llx_c_actioncomm type column 2016-11-14 12:21:08 +01:00
Laurent Destailleur
af2f4cf78d Merge branch 'patch-20' of https://github.com/defrance/dolibarr into 
defrance-patch-20

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
	htdocs/install/mysql/tables/llx_facturedet.sql
 2016-11-12 13:36:45 +01:00
Laurent Destailleur
645eee57db Fix syntax error 2016-11-12 11:22:18 +01:00
Regis Houssin
97a8a84b9d Fix: missing encrypt/decrypt with llx_const 2016-11-12 09:57:41 +01:00
BENKE Charlie
056e26e595 Update 4.0.0-5.0.0.sql 2016-11-11 15:05:56 +01:00
Laurent Destailleur
787f508172 More complete fix for #5974 2016-11-11 14:25:22 +01:00
Laurent Destailleur
360d697fc3 Add missing field to store result of email sending 2016-11-11 13:45:18 +01:00
Laurent Destailleur
fe9c880984 NEW Add missing unique key on table llx_links 2016-11-10 14:24:29 +01:00
Laurent Destailleur
bc245165c0 Merge pull request #5961 from defrance/patch-40 
When constant change, please add update of constant
 2016-11-08 14:35:50 +01:00
Laurent Destailleur
608ca669fd Update doc 
Add missing table in upgrade script
 2016-11-07 03:18:53 +01:00
Marcos García de La Fuente
286095f5cd Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-11-06 15:01:40 +01:00
BENKE Charlie
b3fdf4b872 Update 4.0.0-5.0.0.sql 2016-11-06 14:49:16 +01:00
BENKE Charlie
29196eedde When constant change, please add update of constant 2016-11-06 12:03:28 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
c858c5b39b Merge pull request #5941 from simnandez/develop 
Fix bad sql query introduced by #38e6c9c
 2016-10-29 17:50:10 +02:00
Laurent Destailleur
cb3f0dadab NEW Can see/edit the customer ref of a shipment 2016-10-29 14:52:13 +02:00
Juanjo Menent
9bd44185c7 Fix bad sql query introduced by #38e6c9c 2016-10-29 14:46:57 +02:00
Laurent Destailleur
38e6c9cc57 Fix multientity on overwritting translation not yet supported. 2016-10-28 22:47:37 +02:00
aspangaro
883446c5bb Merge remote-tracking branch 'Upstream/develop' into 5.0-p32 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-10-25 22:09:40 +02:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
aspangaro
6e7f104c5f Update works 2016-10-25 07:41:01 +02:00
Laurent Destailleur
f1421a2ee4 Rename constant with english name 2016-10-24 13:10:35 +02:00
Laurent Destailleur
fdcc858008 Merge branch 'dev_resource_extrafields' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 02:05:34 +02:00
Laurent Destailleur
3c3c5d06a1 Merge branch 'NEW_parent_warehouse' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_parent_warehouse

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 00:58:02 +02:00
Laurent Destailleur
abc471575a Fix sql error 2016-10-22 17:00:19 +02:00