Commit Graph

2120 Commits

Author SHA1 Message Date
Laurent Destailleur
c78e5d23ea Work on the customer payment mode tab 2018-03-13 20:23:59 +01:00
Laurent Destailleur
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
Laurent Destailleur
5d512af4b4 Fix migration 2018-03-13 09:53:33 +01:00
Laurent Destailleur
7362b3f3d7 Add table to store thirparty account in external web sites 2018-03-12 15:59:03 +01:00
Laurent Destailleur
18b6b70f45 Merge pull request #8358 from frederic34/patch-2
Update llx_ticketsup.sql
2018-03-12 12:28:40 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Frédéric FRANCE
98320ffad2 Update 7.0.0-8.0.0.sql 2018-03-12 08:36:18 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
florian HENRY
cfdaa7c88d ticket sup make it work 2018-03-11 16:07:13 +01:00
Laurent Destailleur
c1d148458b Fix migration 2018-03-09 23:44:00 +01:00
Laurent Destailleur
489dde4db4 Prepare database to store payment modes of customers 2018-03-08 22:26:42 +01:00
Laurent Destailleur
1c9e7145e7 Merge pull request #8276 from ATM-Consulting/develop_atm
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
235db1f405 Enhance OAuth module to store the stripe account in llx_oauth_token 2018-03-08 19:51:18 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
fe45e82e99 Fix use of table llx_c_paiement (param showempty was not used/set) 2018-03-07 19:00:38 +01:00
Laurent Destailleur
78cbd92e98 Fix init data on table of payment mode 2018-03-07 18:30:39 +01:00
Laurent Destailleur
94140b04ca FIX Missing primary key on payment modes 2018-03-07 15:28:50 +01:00
Laurent Destailleur
cf45f78d7e Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
2018-03-07 13:12:23 +01:00
Laurent Destailleur
d07cd8c04b Update 7.0.0-8.0.0.sql 2018-03-07 13:11:18 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
2018-03-06 09:20:45 +01:00
Marc de Lima Lucio
fad521d66c FIX: supplier disocunts: add forgotten index to migration script 2018-03-05 12:09:13 +01:00
florian HENRY
473c16ede5 fix pgSQL install 2018-03-02 17:30:46 +01:00
Marc de Lima Lucio
059801fe03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-01 10:22:21 +01:00
Laurent Destailleur
0c4bf2340f Fix missing primary key 2018-02-28 15:22:58 +01:00
Laurent Destailleur
e2c7585ae7 NEW Support alternative aliases of page name in website 2018-02-28 14:36:22 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5 NEW: supplier relative discounts 2018-02-27 16:30:39 +01:00
kkhelifa-opendsi
90f4c985f6 Merge branch 'develop' into product_supplier_buyprice_multicurrency 2018-02-26 09:54:09 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
2cd5ed65a6 Clean deprecated (field unit_charge in supplier price) 2018-02-25 14:13:09 +01:00
Laurent Destailleur
8dceb8930f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/user/card.php
2018-02-25 12:41:17 +01:00
Laurent Destailleur
c8078b54b5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
2018-02-24 12:52:57 +01:00
Laurent Destailleur
435e4823a5 Fix some warning during install 2018-02-24 11:58:09 +01:00
Laurent Destailleur
787a137509 Add column for accounting doc 2018-02-23 15:38:39 +01:00
KHELIFA
54dba24ab5 Add multicurrency support for product buy price for supplier propales, orders and invoices 2018-02-23 11:06:07 +01:00
John
b276a8186e Fix sql entity for sub query 2018-02-21 10:03:04 +01:00
Laurent Destailleur
87a3019e73 Fix upgrade missing steps 2018-02-20 06:03:22 +01:00
Laurent Destailleur
eb0073c330 Fix upgrade missing steps 2018-02-20 05:53:53 +01:00
Laurent Destailleur
31d0679876 Add data 2018-02-19 19:52:51 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Marc de Lima Lucio
daca27b2ed NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring 2018-02-14 18:02:40 +01:00
Laurent Destailleur
475b89bac1 Merge branch 'develop' into new_order_min_amount 2018-02-08 14:20:53 +01:00
Laurent Destailleur
12aec8f806 Prepare database for invoicing of projects 2018-02-02 15:19:04 +01:00
Laurent Destailleur
cebda2b141 Prepare 8.0 2018-01-28 10:57:12 +01:00
Laurent Destailleur
86e501808c Merge pull request #7975 from dolibarr95/patch-31
Create 7.0.0-8.0.0.sql
2018-01-26 18:03:07 +01:00
Laurent Destailleur
3c3e02dbea Fix missing fields 2018-01-21 22:47:15 +01:00
Maxime Kohlhaas
6f248a6590 New allow to define order min amount 2018-01-20 20:17:56 +01:00