Commit Graph

100 Commits

Author SHA1 Message Date
Laurent Destailleur
c496301486 Clean table tmp_llx_accounting_account - #30825 2024-09-05 15:44:43 +02:00
Regis Houssin
111f73bd86 FIX add default value of timestamp for avoid error 2020-10-08 12:29:01 +02:00
Laurent Destailleur
310c5f9eb6 Fix size of field 2020-05-09 21:56:51 +02:00
ptibogxiv
ace01f7442 Fix wrong sql update version 2019-08-01 16:29:42 +02:00
John BOTELLA
d7a393bbd3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-04 14:00:18 +02:00
Laurent Destailleur
5f0fbcea9a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
2019-06-02 11:49:33 +02:00
Regis Houssin
bdd54ae245 FIX missing llx_const encrypt 2019-05-30 11:42:28 +02:00
Laurent Destailleur
691159c56b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-24 10:24:55 +02:00
Laurent Destailleur
e0b71fd258 Fix size of column 2019-04-24 10:07:34 +02:00
Laurent Destailleur
321ffb859b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/perweek.php
2019-04-08 14:09:18 +02:00
Laurent Destailleur
b23f74eab1 FIX Status of opportunity should never be -1 2019-04-08 12:17:57 +02:00
Laurent Destailleur
9c7464d157 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/list.php
	htdocs/societe/card.php
2019-04-04 17:42:12 +02:00
Laurent Destailleur
1ac51b6e06 More complete example to fix migration error from v8 2019-04-04 13:46:01 +02:00
Laurent Destailleur
8f65ee2296 Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
7e31e6b4f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
88c02143fa Fix missing fields 2019-03-13 13:40:57 +01:00
atm-quentin
1b9a2e5cfc FIX migration 9 to 10 2019-02-27 09:27:15 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2019-02-27 01:28:12 +01:00
Laurent Destailleur
3ba69fc93a Fix missing ; after sql request 2019-02-25 15:06:55 +01:00
Laurent Destailleur
c0be66b5e5 FXI Remove duplicate record before trying to create unique key 2019-02-25 14:55:29 +01:00
Laurent Destailleur
cdf85b0d00 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-23 16:02:35 +01:00
Laurent Destailleur
9ba6e3f8f5 FIX #10638 2019-02-23 15:57:57 +01:00
Laurent Destailleur
5fceee3048 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-02-12 19:02:19 +01:00
Laurent Destailleur
f311d50201 Fix unique key in accounting_account
Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-02-12 15:53:43 +01:00
Laurent Destailleur
a0c1e5ed84 Fix unique key in accounting_account 2019-02-12 15:43:24 +01:00
Laurent Destailleur
0f61a99cc6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-21 05:51:35 +01:00
Laurent Destailleur
f8b205aae3 Fix missing index 2019-01-21 05:16:23 +01:00
Laurent Destailleur
95bfecdd60 Fix missing index in migration 2019-01-21 05:03:31 +01:00
Laurent Destailleur
7493ba018a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-01-20 20:38:26 +01:00
Laurent Destailleur
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
f7c11ec7f4 Fix unit test on accounting 2019-01-20 17:06:24 +01:00
markus
a45ea9239d Rename consts and cleanup 2019-01-19 14:24:20 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
5f9bbbcdd7 Fix migration 2019-01-03 11:12:14 +01:00
Laurent Destailleur
e0e298f07b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 03:26:15 +01:00
Laurent Destailleur
bf9ee18bed Standardize code. 2018-12-17 03:25:45 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Laurent Destailleur
1c49599a47 Work on cash fence feature 2018-12-15 19:46:51 +01:00
Laurent Destailleur
54ffba793f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang
2018-12-15 18:21:37 +01:00
Laurent Destailleur
33a91ff707 Add missing POS closure feature 2018-12-15 16:47:06 +01:00
Laurent Destailleur
fec64a78ab Merge branch 'develop' into New_manage_loan_schedule 2018-12-14 10:54:09 +01:00
Laurent Destailleur
a44dca7e71 Removed deprecated table 2018-12-08 11:37:47 +01:00
Laurent Destailleur
37fe8afea3 Code comment 2018-12-07 14:54:40 +01:00
Laurent Destailleur
e7c87c31b6 Code comment 2018-12-06 21:32:39 +01:00
Laurent Destailleur
c3e2f73e48 FIX #10144 2018-12-01 19:45:30 +01:00
Laurent Destailleur
dbef8fc380 FIX Add field for data becoming mandatory by some online payment system 2018-11-28 13:13:38 +01:00
Laurent Destailleur
200de22807 Missing image in container 2018-11-20 16:48:34 +01:00
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +01:00
markus
ac0f46f9e5 for Denmark: forme_jurisdisque additions 2018-11-15 11:10:54 +01:00