lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
81,183 Commits 43 Branches 150 Tags 886 MiB
2f064567ef
Commit Graph

5118 Commits

Author SHA1 Message Date
Laurent Destailleur
c4a4efe0dc
Merge pull request #11769 from Tim-Otte/develop 
NEW: Added odt support to supplier orders
 2019-09-03 13:04:33 +02:00
florian HENRY
405c92640c on going 2019-09-02 14:47:32 +02:00
florian HENRY
b535bc0cb9 start dev 2019-09-02 11:27:04 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Laurent Destailleur
8366d89b41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/10.0.0-11.0.0.sql
 2019-08-28 18:15:22 +02:00
Laurent Destailleur
d668b79738 NEW Add column tms into the table of targets for emailing 2019-08-28 18:14:46 +02:00
Laurent Destailleur
27b61eca32 NEW Add column tms into the table of targets for emailing 2019-08-28 18:12:02 +02:00
Tim Otte
5abfc04900
Merge branch 'develop' into develop 2019-08-27 16:37:41 +02:00
Tim Otte
75152cb210 Added odt support to supplier orders 2019-08-27 16:22:16 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
c2c9e1d042 Fix warning 2019-08-27 12:15:29 +02:00
Laurent Destailleur
047298cded
Merge pull request #11511 from atm-florianm/9.0_FIX_dispatched-products-array-bug 
9.0 fix dispatched products array bug
 2019-08-26 23:58:40 +02:00
Laurent Destailleur
1463302bdd Add option to disable the anonymous ping 2019-08-23 16:23:31 +02:00
Laurent Destailleur
bc269462a7 FIX Do not autocomplete pass on first installation. 2019-08-23 15:30:48 +02:00
ptibogxiv
01f0a6a19f
Update llx_adherent_type.sql 2019-08-23 14:56:59 +02:00
ptibogxiv
b8fce830f7
Update llx_adherent_type.sql 2019-08-23 14:56:38 +02:00
ptibogxiv
60a7ba463c
Update 10.0.0-11.0.0.sql 2019-08-23 14:53:40 +02:00
Florian Mortgat
fa29415e6a Moved repair payload from a specific script to install/repair.php 2019-08-22 14:06:18 +02:00
ptibogxiv
e43d996780
Update 10.0.0-11.0.0.sql 2019-08-21 16:45:53 +02:00
ptibogxiv
869e497a48
NEW : Platforme compliance with Stripe Connect 2019-08-21 16:41:36 +02:00
Laurent Destailleur
23b1c24bf7 Fix template 2019-08-16 06:28:25 +02:00
Laurent Destailleur
5d1bfdaa29
Merge pull request #11678 from atm-greg/develop_fk_projet_on_stock_movement 
NEW Add fk projet on stock movement
 2019-08-15 19:27:06 +02:00
Laurent Destailleur
14030affe5 Update website templates 2019-08-15 02:57:00 +02:00
Laurent Destailleur
bb35d9be0c Fix copy of templates during activation of module 2019-08-15 01:50:01 +02:00
Laurent Destailleur
f81463af0c Update templates 2019-08-15 00:55:47 +02:00
Laurent Destailleur
dfe2c3de74 Add template stellar 2019-08-15 00:31:37 +02:00
Laurent Destailleur
f753799810 FIX Support #tag into url of website module 2019-08-14 23:27:34 +02:00
Laurent Destailleur
bb4618e2cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
 2019-08-14 04:12:37 +02:00
Laurent Destailleur
77c96a49e1 Update website template 2019-08-13 04:53:47 +02:00
Laurent Destailleur
8ad2081555 NEW Can select website templates from available default templates 2019-08-12 22:19:24 +02:00
atm-greg
7c136e77ec bad migration file 2019-08-12 15:18:40 +02:00
atm-greg
f8ad8d72c0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fk_projet_on_stock_movement 2019-08-12 15:16:43 +02:00
atm-greg
acdf13d769 add fk_projet on stock movements 2019-08-12 15:08:15 +02:00
Laurent Destailleur
86d39b435b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-12 02:42:11 +02:00
Laurent Destailleur
5ca988b3d2 Fix position of requests 2019-08-12 02:36:15 +02:00
Frédéric FRANCE
d55377981c
Update 10.0.0-11.0.0.sql 2019-08-07 13:27:55 +02:00
Frédéric FRANCE
28100f67ac
Update llx_c_price_expression.sql 2019-08-07 13:25:14 +02:00
ptibogxiv
f7134340e8
Update llx_product.sql 2019-08-04 13:22:01 +02:00
Laurent Destailleur
f8e19beb5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 18:30:59 +02:00
Laurent Destailleur
808d6ba389 Fix phpcs 2019-08-01 18:30:39 +02:00
Laurent Destailleur
85dbec6ae7 Move sql in correct migration file 2019-08-01 16:33:34 +02:00
Laurent Destailleur
25725a5a6a
Merge pull request #11615 from ptibogxiv/patch-202 
Fix wrong sql update version retained_warranty
 2019-08-01 16:32:00 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
ptibogxiv
ace01f7442
Fix wrong sql update version 2019-08-01 16:29:42 +02:00
Laurent Destailleur
6693f9fbca Fix phpcs 2019-08-01 16:24:19 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
 2019-07-30 20:55:15 +02:00
Laurent Destailleur
5f2439bf0a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-07-30 20:37:44 +02:00
Florian Mortgat
de293c4ef2 FIX issue #9300: install error with PostgreSQL when using custom table prefix 2019-07-30 14:09:03 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Laurent Destailleur
3a740313fe
Merge branch '10.0' into 10.0 2019-07-25 18:31:26 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
e88ca8ae89 Fix migration 2019-07-25 15:07:24 +02:00
Laurent Destailleur
4833c2bf49 Merge 2019-07-22 18:50:17 +02:00
Laurent Destailleur
f5afc50067 Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries 2019-07-22 18:47:35 +02:00
Laurent Destailleur
a379d7804c
Merge pull request #11535 from aspangaro/11.0_p1 
QUAL Move ligne.php to line.php
 2019-07-22 18:33:06 +02:00
jcp
cfaf9ce0ea SET special_code=4 for existing records 2019-07-22 11:44:18 +02:00
Laurent Destailleur
5d1a50bcb4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-20 14:03:18 +02:00
Laurent Destailleur
ac8a776113 FIX Column 'paid' missing in expense report 2019-07-20 14:02:53 +02:00
Laurent Destailleur
826851e1a9 Fix migration 2019-07-20 14:01:00 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Alexandre SPANGARO
5f042cf6ad QUAL Move ligne.php to line.php 2019-07-19 23:19:06 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
fafb7956de Fix position of triggers 2019-07-19 18:52:44 +02:00
Laurent Destailleur
a55da8f8f8 Fix migration 2019-07-19 17:20:33 +02:00
Alexandre SPANGARO
21bd46fc15 Merge remote-tracking branch 'upstream/develop' into 11.0_salaries 2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda NEW Extrafields on salaries 2019-07-17 14:09:25 +02:00
Laurent Destailleur
fed598236c Add field 2019-07-17 01:12:48 +02:00
Laurent Destailleur
61a574701b New Add field prefix_session in llx_events 2019-07-17 01:11:10 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Regis Houssin
332abd2a9f FIX __INFOS__ tag not exists 2019-07-13 11:02:45 +02:00
Laurent Destailleur
e5d34de877 FIX compatibility mysql 8. rank is reserved 
FIX Permission for BOM menu
 2019-07-09 00:14:01 +02:00
Laurent Destailleur
4387d40b9a Translation lignes -> lines 2019-07-05 21:55:08 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
46f590f0be Add column iplastlogin and ippreviouslogin 2019-07-01 15:44:34 +02:00
Laurent Destailleur
c9477f5c4f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:29:33 +02:00
Laurent Destailleur
511b21ca9c Fix for doliwamp 2019-07-01 00:22:28 +02:00
Laurent Destailleur
46ced373be Fix for doliwamp 2019-06-30 23:52:28 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
John Botella
7e14a598e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-26 09:43:43 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
83f5b23ade Doc 2019-06-25 22:39:04 +02:00
Laurent Destailleur
85919d8324 Code comment 2019-06-25 22:02:19 +02:00
Laurent Destailleur
33ce52364a Drop no more used column 2019-06-25 16:08:22 +02:00
Laurent Destailleur
06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
 2019-06-25 13:03:54 +02:00
Laurent Destailleur
b8b0ad0d27 Fix migration 2019-06-25 11:22:35 +02:00
John Botella
7b6925b8f7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-24 10:29:43 +02:00
Laurent Destailleur
c1f6b76a6a Remove deprecated 2019-06-22 18:29:24 +02:00
Laurent Destailleur
db241b22dd Fix clean of database 2019-06-22 14:33:31 +02:00
Laurent Destailleur
fdff737329 Fix clean of database 2019-06-22 14:33:04 +02:00
Laurent Destailleur
c089a47b4c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 14:15:30 +02:00
Laurent Destailleur
e6ea9cc448 Clean widget not correctly removed 2019-06-22 14:15:10 +02:00
Laurent Destailleur
22b91f3693 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 13:28:44 +02:00
Laurent Destailleur
64de57d781 FIX bad request 2019-06-22 13:28:20 +02:00
Laurent Destailleur
8da5794777 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/accounting.lib.php
	htdocs/product/stock/class/entrepot.class.php
 2019-06-20 18:24:43 +02:00
Laurent Destailleur
faadae8157 Code comment 2019-06-20 15:59:45 +02:00
Laurent Destailleur
06e5fbd649
Merge pull request #11132 from ptibogxiv/patch-174 
NEW add API shipment mode dictionnary
 2019-06-20 03:56:59 +02:00
Laurent Destailleur
77a45b878b Fix migration 2019-06-20 03:56:42 +02:00
Laurent Destailleur
40023c8ba2
Merge branch 'develop' into patch-174 2019-06-20 03:56:29 +02:00
Laurent Destailleur
5fe91afdc2
Update 9.0.0-10.0.0.sql 2019-06-20 03:54:50 +02:00
Laurent Destailleur
d8c2007d92 Prepare v11 alpha 2019-06-20 03:53:33 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield 
NEW add extrafields in warehouses
 2019-06-20 03:16:49 +02:00
Laurent Destailleur
b4cb440b0f
Merge pull request #11359 from inoveaconseil/FIX_BOM_sql 
Fix bom sql
 2019-06-20 02:58:24 +02:00
Laurent Destailleur
13abfc3140 Code comment 2019-06-18 16:46:12 +02:00
Laurent Destailleur
1dc247705d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/holiday/list.php
 2019-06-18 16:11:16 +02:00
Laurent Destailleur
ae00743590 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-18 16:04:48 +02:00
Laurent Destailleur
6afda6a47a FIX invalid link on user.fk_user 2019-06-18 15:57:22 +02:00
Laurent Destailleur
8835b49f3f Debug the accounting-file tool 2019-06-18 14:30:13 +02:00
Nicolas ZABOURI
96c6994827 FIX 2 déclarations of date_valid in SQL 2019-06-18 10:55:16 +02:00
Laurent Destailleur
4f03d4f642
Merge branch '10.0' into patch-189 2019-06-16 17:26:41 +02:00
Laurent Destailleur
badfd47ee7 Fix migration 2019-06-16 17:25:42 +02:00
ptibogxiv
d838ced12e
Update 9.0.0-10.0.0.sql 2019-06-14 18:41:38 +02:00
ptibogxiv
cd5c2c3249
Update llx_bom_bom.sql 2019-06-14 18:39:05 +02:00
ptibogxiv
c6ab092af1
add capacity value for product 2019-06-14 09:12:53 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
73326cfbf9 Removed bad commited files 2019-06-07 16:56:08 +02:00
Laurent Destailleur
8ef7a3abf2 Clean demofile for v10 2019-06-05 11:56:57 +02:00
Laurent Destailleur
d3d0ce4649 Better error message when missing grant privileges 2019-06-05 10:42:59 +02:00
Laurent Destailleur
a70a14b145 Fix migration 2019-06-04 20:06:44 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +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
664e0b81d8 Debug module BOM 2019-06-03 22:07:34 +02:00
Lionel VESSILLER
439eafb637 NEW add extrafields in warehouses 
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
 2019-06-03 15:44:17 +02:00
Laurent Destailleur
3cda0d2dc5 Fix phpcs 2019-06-02 15:49:10 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Laurent Destailleur
300f46cb01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:25 +02:00
Laurent Destailleur
ea58f8a617 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-02 11:49:49 +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
Maxime Kohlhaas
15fd24a511 Fix : remove hardcoded llx_ prefix 2019-05-31 12:14:51 +02:00
Regis Houssin
063fe35c97 FIX missing encrypt llx_const fields 2019-05-30 11:45:55 +02:00
Regis Houssin
bdd54ae245 FIX missing llx_const encrypt 2019-05-30 11:42:28 +02:00
Laurent Destailleur
ae597e7b63
Merge pull request #11252 from KlaasOl/patch-2 
Create llx_accounting_account_nl.sql
 2019-05-29 12:25:42 +02:00
Laurent Destailleur
8c97fc164f
Merge pull request #11253 from KlaasOl/patch-3 
Update llx_accounting_abc.sql
 2019-05-29 12:25:08 +02:00
Laurent Destailleur
05063016e8 FIX #11244 Enhance repair tool 2019-05-29 12:21:51 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
KlaasOl
4301cd5b7a
Update llx_accounting_abc.sql 
Adding chart of account NL VERKORT
 2019-05-26 15:40:44 +02:00
KlaasOl
f879225032
Create llx_accounting_account_nl.sql 
First accounting account scheme for Dutch accounting
 2019-05-26 15:29:50 +02:00
Laurent Destailleur
b7a3cdd7c6 Debug BOM module 2019-05-26 01:31:54 +02:00
Laurent Destailleur
9f9f3bda63 Debug BOM module 2019-05-26 01:06:19 +02:00
Laurent Destailleur
a5865d3e4a Debug BOM 2019-05-25 19:29:33 +02:00
Alexandre SPANGARO
d9e9cb2ea9 Merge branch 'develop' into 10.0_Differentiated_export 2019-05-20 15:02:05 +02:00
florian HENRY
c3dbbe51cf fix missing migration sql for ticket now stable on 10 2019-05-18 23:57:00 +02:00
Laurent Destailleur
a1ec074d03
Merge pull request #11205 from ATM-Marc/NEW_supplier_proposal_contact_type 
FIX: add contact types for supplier proposals (Issue #10949)
 2019-05-18 16:56:40 +02:00
ATM-Marc
2c104ccc4a NEW: contact types for supplier proposals 2019-05-18 14:22:04 +02:00
Laurent Destailleur
9e38f3122d Update for pgsql 2019-05-18 01:26:44 +02:00
Norbert Penel / OSCSS
13b75e35a0 FIx tms field made with modulebuilder 
all new module appear to have a bug on tms, no data can be inserted due to tms default value that can't be null
 2019-05-18 00:20:44 +02:00
Laurent Destailleur
bd1ed4f7ac
Merge branch 'develop' into 10.0_Differentiated_export 2019-05-16 21:26:20 +02:00
Laurent Destailleur
0d6841dacb
Merge pull request #11176 from aspangaro/10.0_FEC 
FIX FEC Remove useless field 'validated'
 2019-05-16 21:20:20 +02:00
Alexandre SPANGARO
60d00e2f5c FIX FEC Remove useless field 'validated' 2019-05-14 06:46:06 +02:00
Alexandre SPANGARO
7c9ccee64d NEW Accountancy - Differentiated export 2019-05-14 05:45:36 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
Laurent Destailleur
cdebca14a7 Fix migration 2019-05-09 17:32:13 +02:00
Laurent Destailleur
1c558c685c Fix class not found 2019-05-09 17:16:35 +02:00
Laurent Destailleur
95bb8a1f75
Update llx_c_shipment_mode.key.sql 2019-05-08 01:57:39 +02:00
Laurent Destailleur
249893a4ab
Update 9.0.0-10.0.0.sql 2019-05-08 01:57:23 +02:00
Laurent Destailleur
53b1dec317
Update 9.0.0-10.0.0.sql 2019-05-08 01:56:52 +02:00
ptibogxiv
e65c8399e6
Update 9.0.0-10.0.0.sql 2019-05-05 19:14:09 +02:00
ptibogxiv
499798b2e0
Update llx_c_shipment_mode.key.sql 2019-05-05 19:11:18 +02:00
ptibogxiv
15cff25bbc
Update llx_c_shipment_mode.sql 2019-05-05 19:10:39 +02:00
ptibogxiv
f0fd0ece60
Update 9.0.0-10.0.0.sql 2019-05-05 15:06:10 +02:00
ptibogxiv
7033243572
FIX url lettre max & colissimo 2019-05-05 15:02:00 +02:00
Laurent Destailleur
3a8d645fb9 Debug module ticket 2019-05-01 20:55:46 +02:00
Ferran Marcet
7a651b5071 New: Add ref_client field on template invoice 2019-04-26 13:53:22 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
Laurent Destailleur
6884999ee3
Merge pull request #10925 from ptibogxiv/patch-146 
NEW morphy value in member type
 2019-04-25 03:00:25 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
 2019-04-25 01:50:48 +02:00
Laurent Destailleur
becf096bf8 FIX ref for table without ref manager are set to NULL. 2019-04-25 01:37:08 +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
1264857211 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/js/timesheet.js
 2019-04-24 10:24:32 +02:00
Laurent Destailleur
8025fb1ac1 Fix size of column 2019-04-24 10:07:58 +02:00
Laurent Destailleur
e0b71fd258 Fix size of column 2019-04-24 10:07:34 +02:00
atm-greg
3231e54abd fix actioncomm module for long trigger names 2019-04-23 16:19:58 +02:00
Laurent Destailleur
c0c723a207 Work on inventory feature 2019-04-23 11:00:28 +02:00
Laurent Destailleur
9930b276ff Fix image link 2019-04-22 17:29:02 +02:00
Laurent Destailleur
fae2983c2a
Merge branch 'develop' into new_user_hr_fields 2019-04-11 18:27:58 +02:00
Laurent Destailleur
2eeb4b8734 Debug ticket module 2019-04-10 15:45:55 +02:00
Laurent Destailleur
1f6f6f6edb Track action close for ticket 2019-04-10 13:21:06 +02:00
Laurent Destailleur
ff629b2355 NEW Color for hover and for checked line is on by default 2019-04-09 15:57:26 +02:00
Laurent Destailleur
65e931cfe2 Work on email collector 2019-04-08 21:22:10 +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
fad2fa48dd NEW Introduce a config parameter $dolibarr_main_instance_unique_id 2019-04-07 15:44:17 +02:00
Laurent Destailleur
302a42a603 PHP 5.4 is no more supported. Minimum PHP is now 5.5+. 2019-04-06 13:20:26 +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
56f8c42b0a The PHP extension php-intl is not mandatory but should be installed to 
have new features working correctly.
 2019-04-03 19:37:54 +02:00
Laurent Destailleur
333ba7b549 Save files for website template 2019-04-03 16:28:16 +02:00
ptibogxiv
3723da43ca
Update 9.0.0-10.0.0.sql 2019-03-27 12:50:16 +01:00
ptibogxiv
63ad6b779a
Update llx_adherent_type.sql 2019-03-27 12:49:26 +01:00
Laurent Destailleur
e7dea3cfe7
Merge pull request #10911 from leangjia/develop 
Add China regions.
 2019-03-26 19:23:08 +01:00
Laurent Destailleur
4c4ad0548d Fix for creation of index composed with type 2019-03-26 17:56:46 +01:00
liAnGjiA
62767fc059
Update llx_10_c_regions.sql 2019-03-25 10:16:41 +08:00
leangjia
a207a699b6 Add China regions. 2019-03-25 00:21:09 +08:00
Laurent Destailleur
8ca5b2e45f Rename field 2019-03-22 17:43:53 +01:00
Laurent Destailleur
d8e3624d65
Merge pull request #10851 from wdammak/patch-37 
Add fk_project to product table
 2019-03-21 18:32:49 +01:00
Laurent Destailleur
ae2f76f6bd
Update llx_product.sql 2019-03-21 18:32:40 +01:00
Laurent Destailleur
52b91499ba
Update 9.0.0-10.0.0.sql 2019-03-21 18:31:13 +01:00
atm-greg
d809c017ca Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into test_pgsql_installation 2019-03-20 06:10:53 +01:00
Laurent Destailleur
9a3c66b057
Merge pull request #10846 from grandoc/new_branch_15_03_2019 
New branch 15 03 2019
 2019-03-19 12:13:02 +01:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
Laurent Destailleur
6970d066f8 Better compatibility 2019-03-19 11:23:38 +01:00
Laurent Destailleur
a4372e24bf Migration 2019-03-19 11:21:55 +01:00
Laurent Destailleur
77b675bec1
Merge pull request #10876 from ptibogxiv/patch-143 
FIX support duration/time units with services
 2019-03-19 11:20:13 +01:00
Laurent Destailleur
81fb18befe Complete unit table 2019-03-19 11:19:46 +01:00
wdammak
56bee8a20f
Update llx_product.key.sql 2019-03-18 20:23:45 +01:00
wdammak
cf0bc88601
Update llx_product.sql 2019-03-18 20:19:30 +01:00
ptibogxiv
eb196ba8e6
Update 9.0.0-10.0.0.sql 2019-03-18 14:25:13 +01:00
ptibogxiv
9178939fe6
ADD week, month, year 2019-03-18 14:21:36 +01:00
ptibogxiv
030048db28
FIX compatibility of minute with php unit value 2019-03-18 14:07:31 +01:00
atm-ph
466a5e2e81 Fix postgreSQL migration 2019-03-18 10:47:56 +01:00
Maxime Kohlhaas
0a0e29a089 New fields on user object for hrm purpose 2019-03-16 08:53:06 +01:00
wdammak
5ee749c19d
Update 9.0.0-10.0.0.sql 2019-03-15 20:46:38 +01:00
wdammak
c9f89f3854
Add fk_project to product table 
Prepare the generation of a product from a project.
 2019-03-15 20:28:28 +01:00
Laurent Destailleur
bca18f22ae Prepare link with expense report line and document 2019-03-15 16:23:38 +01:00
Philippe GRAND
2e4bf72382 update with html5 compliant code 2019-03-15 09:45:48 +01:00
Philippe GRAND
3d93fba4b8 update with html5 compliant code 2019-03-15 09:45:01 +01:00
Philippe GRAND
404872298f update with html5 compliant code 2019-03-15 09:44:17 +01:00
Philippe GRAND
f028f74c7c update with html5 compliant code 2019-03-15 09:43:33 +01: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
c32551cb62 Fix size of varchar 2019-03-13 13:42:14 +01:00
Laurent Destailleur
88c02143fa Fix missing fields 2019-03-13 13:40:57 +01:00
Laurent Destailleur
6ae36ce6a7 Work on BOM 2019-03-12 19:20:01 +01:00
Laurent Destailleur
f356d534cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-11 17:48:03 +01:00
Laurent Destailleur
9c8aff0a28 FIX #10787 2019-03-11 17:47:53 +01:00
Laurent Destailleur
def8e770ca
Fix name of indexes 2019-03-11 17:47:19 +01:00
wdammak
fa3246e70b
Missing index to improve the performance of product/variants display 2019-03-10 03:09:23 +01:00
wdammak
0241b0d4ee
Missing index to improve the performance of product/variants display 
https://github.com/Dolibarr/dolibarr/issues/10787
 2019-03-10 03:05:15 +01:00
Laurent Destailleur
10b9fdc1fd Fix column definition 2019-03-09 02:05:28 +01:00
Laurent Destailleur
f54eb78260 NEW Show the latest date of subscription in member statistics reports 2019-03-07 12:22:24 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
 2019-03-07 11:16:24 +01:00
Laurent Destailleur
e67890bd22 NEW Can enter price with or without tax when entering expense repor line 2019-03-07 11:09:04 +01:00
Laurent Destailleur
1b0aec0847 Complete fields for template invoices 2019-03-06 20:51:07 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
Laurent Destailleur
c06d2f6c3b Remove warning 2019-03-05 18:22:03 +01:00
Laurent Destailleur
925def5390 Work on BOM module 2019-03-04 13:37:00 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +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
6373e1db84
Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00
Laurent Destailleur
9e82c37963 WIP Start module BOM 2019-02-26 19:27:04 +01:00
Laurent Destailleur
3ba69fc93a Fix missing ; after sql request 2019-02-25 15:06:55 +01:00
Laurent Destailleur
1be1ee1670 Remove duplicate record 2019-02-25 14:56:28 +01:00
Laurent Destailleur
c0be66b5e5 FXI Remove duplicate record before trying to create unique key 2019-02-25 14:55:29 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00