lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

3563 Commits

Author SHA1 Message Date
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +02:00
Laurent Destailleur
e02794248e
Merge branch 'develop' into patch-264 2019-10-07 13:25:16 +02:00
Frédéric FRANCE
f80fa08a2d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-07 07:57:05 +02:00
Laurent Destailleur
d4bb6490e9 Fix migration 2019-10-06 16:25:22 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
florian HENRY
2d3dd9ed3c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-10-04 18:10:16 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 18:37:14 +02:00
Frédéric FRANCE
edf559697a
restore unfinished old commit 2019-10-01 23:47:45 +02:00
Frédéric FRANCE
9755d15f52
work on migration script 2019-10-01 17:51:44 +02:00
Laurent Destailleur
22f07fe54d
Merge branch 'develop' into patch-234 2019-09-30 18:09:05 +02:00
ptibogxiv
f132f2f947
Update 10.0.0-11.0.0.sql 2019-09-29 15:40:26 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Laurent Destailleur
d0d884742f FIX #11861 Not consistent code to manage measuring units 2019-09-27 19:45:33 +02:00
Laurent Destailleur
07b555b965
Merge branch 'develop' into patch-255 2019-09-27 15:23:15 +02:00
Laurent Destailleur
f5c839217a
Merge pull request #11914 from fmarcet/develop 
Fix: Load invoices only if showed
 2019-09-27 14:34:16 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Ferran Marcet
a8cc11d232 Merge branch 'developup' into develop 2019-09-24 13:38:11 +02:00
Laurent Destailleur
7b3e64d67f NEW Support of Extrafields on Leave requests. 2019-09-24 12:01:18 +02:00
Laurent Destailleur
64fc735340 Fix length of fields to card saved with setupintent 2019-09-23 18:12:58 +02:00
Laurent Destailleur
1584a4bf79 Add trigger event USER_SENTBYMAIL in agenda 2019-09-23 12:27:51 +02:00
Laurent Destailleur
a43253eab8 Fix for deposit not correctly closed 2019-09-17 18:49:56 +02:00
ptibogxiv
b969de46bc
Update 10.0.0-11.0.0.sql 2019-09-17 14:05:39 +02:00
Ferran Marcet
c48fc3a2cf Merge branch 'developup' into develop 
# Conflicts:
#	htdocs/compta/facture/fiche-rec.php
#	htdocs/install/mysql/migration/9.0.0-10.0.0.sql
 2019-09-17 09:27:42 +02:00
Frédéric FRANCE
904d0ecaee
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 18:42:31 +02:00
Laurent Destailleur
54f0532073 Work on #4432 2019-09-14 16:51:57 +02:00
Frédéric FRANCE
230c14e189
add social networks 2019-09-12 22:32:41 +02:00
Frédéric FRANCE
bed959bb38
add entity 2019-09-12 21:17:52 +02:00
Frédéric FRANCE
6f33874d75
add entity 2019-09-12 21:13:00 +02:00
Frédéric FRANCE
e0f17cc71c
add socialnetworks dictionary 2019-09-11 22:47:23 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
florian HENRY
617e430998 fix stravis and sticker 2019-09-09 12:31:17 +02:00
florian HENRY
63a83a0fa5 resolve conflict 2019-09-09 11:35:37 +02:00
Laurent Destailleur
8381b93e80 Fix init of public holidays 2019-09-09 11:06:54 +02:00
Laurent Destailleur
15eaa5cbd8 NEW Public holidays are now in a table (no more hard coded per country) 2019-09-09 10:27:56 +02:00
florian HENRY
bdb297a380 resolve conflict 2019-09-09 10:15:44 +02:00
Laurent Destailleur
ca71f02d41
Merge branch 'develop' into develop_pdf 2019-09-06 23:30:12 +02:00
Laurent Destailleur
e1ee70fd8f Start to implement date selection of supplier proposals 2019-09-06 12:45:27 +02:00
ptibogxiv
ead8d29ed3
Update 10.0.0-11.0.0.sql 2019-09-06 11:32:46 +02:00
florian HENRY
dff7be59c8 mostlyDone 2019-09-06 09:22:53 +02:00
Laurent Destailleur
37a32af7b0 NEW Add dictionary to store public holidays. 2019-09-05 20:19:13 +02:00
Regis Houssin
ecaa2df0b8 FIX change "rowid" type in llx_accounting_account (bigint instead int) 2019-09-05 10:37:09 +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
ptibogxiv
60a7ba463c
Update 10.0.0-11.0.0.sql 2019-08-23 14:53:40 +02:00
ptibogxiv
e43d996780
Update 10.0.0-11.0.0.sql 2019-08-21 16:45:53 +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
Frédéric FRANCE
d55377981c
Update 10.0.0-11.0.0.sql 2019-08-07 13:27:55 +02:00
Laurent Destailleur
85dbec6ae7 Move sql in correct migration file 2019-08-01 16:33:34 +02:00
ptibogxiv
ace01f7442
Fix wrong sql update version 2019-08-01 16:29:42 +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
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
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
jcp
cfaf9ce0ea SET special_code=4 for existing records 2019-07-22 11:44:18 +02:00
Alexandre SPANGARO
2c74caff90 WIP 2019-07-22 06:56:55 +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
Alexandre SPANGARO
8b8aaafc05 Merge branch 'develop' into 10.0_intracommreport 2019-07-20 05:47:31 +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
a55da8f8f8 Fix migration 2019-07-19 17:20:33 +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
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
46f590f0be Add column iplastlogin and ippreviouslogin 2019-07-01 15:44:34 +02:00
Alexandre SPANGARO
9da91c06ed Merge branch 'develop' into 10.0_intracommreport 2019-06-26 15:11:43 +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
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
Alexandre SPANGARO
4a84dcaa62 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-06-23 21:47:34 +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
Alexandre SPANGARO
69f15db4e9 Fix migration - Move to v11 2019-06-20 09:37:23 +02:00
Alexandre SPANGARO
20b516885f WIP 2019-06-20 09:33:01 +02:00
Laurent Destailleur
77a45b878b Fix migration 2019-06-20 03:56:42 +02:00
Laurent Destailleur
d8c2007d92 Prepare v11 alpha 2019-06-20 03:53:33 +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
Alexandre SPANGARO
abfb708044 Merge branch 'develop' into 10.0_intracommreport 2019-06-19 21:43:40 +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
Laurent Destailleur
badfd47ee7 Fix migration 2019-06-16 17:25:42 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export 2019-06-12 13:27:49 +02:00
Laurent Destailleur
a70a14b145 Fix migration 2019-06-04 20:06:44 +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
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
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
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
Alexandre SPANGARO
ba4bd274c0 WIP 2019-05-20 14:52:06 +02:00
Alexandre SPANGARO
e81dcb6060 WIP Update database 2019-05-19 21:26:49 +02:00
florian HENRY
c3dbbe51cf fix missing migration sql for ticket now stable on 10 2019-05-18 23:57:00 +02:00
ATM-Marc
2c104ccc4a NEW: contact types for supplier proposals 2019-05-18 14:22:04 +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
ptibogxiv
f0fd0ece60
Update 9.0.0-10.0.0.sql 2019-05-05 15:06:10 +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
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
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
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
ptibogxiv
3723da43ca
Update 9.0.0-10.0.0.sql 2019-03-27 12:50:16 +01: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
52b91499ba
Update 9.0.0-10.0.0.sql 2019-03-21 18:31:13 +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
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
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
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
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
925def5390 Work on BOM module 2019-03-04 13:37:00 +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
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Laurent Destailleur
f83f746123 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2019-02-23 16:03:40 +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
ptibogxiv
d490dd4dec
NEW POS support in order 
Save informations for online / API shopping and push to invoice
 2019-02-20 12:15:43 +01:00
Laurent Destailleur
317f3dd90b
Merge pull request #10603 from wdammak/patch-27 
Add default warehouse id for a user
 2019-02-15 15:06:21 +01:00
Laurent Destailleur
662d707320
Update 9.0.0-10.0.0.sql 2019-02-15 15:06:00 +01:00
wdammak
0a8c72c93b
rename column default_warehouse to fk_warehouse 2019-02-14 19:36:23 +01:00
Laurent Destailleur
04942d3016
Merge branch 'develop' into patch-110 2019-02-14 16:11:56 +01:00
Laurent Destailleur
00cfee0c37
Update 9.0.0-10.0.0.sql 2019-02-14 16:10:06 +01:00
wdammak
31bcc47b68
Add default warehouse id for a user 
This will help to organize employees and know the default warehouse for a customer.
 2019-02-14 13:47:02 +01:00
Laurent Destailleur
3050366372 Fix table of units already exists. Merge duplicate c_measuring_units 
with c_units.
 2019-02-14 13:02:44 +01:00
Laurent Destailleur
5a0d4c4cdc
Merge branch 'develop' into patch-110 2019-02-14 10:32:05 +01:00
florian HENRY
e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php
 2019-02-13 09:23:52 +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
ptibogxiv
85272b8345
NEW support stripe payment prelevement 2019-02-12 18:58:57 +01:00
florian HENRY
914de5e089 fix mùigration script 2019-02-12 18:08:21 +01:00
florian HENRY
5b5f96bafb NEW : measuring unit dictionnary and product size/unit import 2019-02-12 16:58:11 +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
Alexandre SPANGARO
13cf3b1d7f Add subledger in various payment 2019-02-01 15:50:12 +01:00
Laurent Destailleur
56838bc659 Fix missing field into migration 2019-01-27 18:11:18 +01:00
Laurent Destailleur
70c52e6417 Add field calling_duration in table llx_actioncomm 2019-01-26 01:17:41 +01:00
Laurent Destailleur
b1a4e3abd5 To be sure table is dropped 2019-01-21 16:44:51 +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
9c1339ae06 Fix migration with pgsql 2019-01-21 04:27:30 +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
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays 
Add configurable days to SEPA Withdrawal  Execution Date
 2019-01-20 19:47:57 +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
ptibogxiv
a36cf5f2c7
Update 9.0.0-10.0.0.sql 2019-01-17 20:34:45 +01:00
ptibogxiv
ee595ca9b5
Update 9.0.0-10.0.0.sql 2019-01-17 17:40:47 +01:00
Laurent Destailleur
003f499eb0 Add url_id into unique index of bank_url 2019-01-09 13:02:19 +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
6ee484e2a2 Fix migration 2018-12-17 09:38:36 +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
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
3765db422a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/tables/llx_loan.sql
 2018-12-14 10:57:11 +01:00
Laurent Destailleur
6eaa6a1d28 Add missing column 2018-12-14 10:56:13 +01:00
Laurent Destailleur
fec64a78ab
Merge branch 'develop' into New_manage_loan_schedule 2018-12-14 10:54:09 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
b27ec54379 A better way to manage unsubscribed emails 2018-12-10 14:35:33 +01:00
Laurent Destailleur
cd3716ff9f Dolibarize module ticket 2018-12-08 16:37:41 +01:00
Laurent Destailleur
21b3bbc2e6 Merge 2018-12-08 11:55:27 +01:00
Laurent Destailleur
b43c2ce839 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-08 11:52:12 +01:00
Laurent Destailleur
930312b425 FIX Migration do not create not used table 2018-12-08 11:51:46 +01:00
Laurent Destailleur
9ed34e2b35 FIX Can relaunch install on v8 2018-12-08 11:51:01 +01:00
Laurent Destailleur
a915d82883 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-08 11:42:30 +01:00
Laurent Destailleur
d2f0c87d8f FIX Removed not use table 2018-12-08 11:41:08 +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
Maxime Kohlhaas
b37209565f Correct sql index change 2018-12-05 16:50:02 +01:00
Laurent Destailleur
d9bb39970f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/barcode.php
 2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:17:25 +01:00
Laurent Destailleur
347384734d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:15:32 +01:00
Maxime Kohlhaas
79b6719b88 Change index 2018-12-04 09:00:53 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
c3e2f73e48 FIX #10144 2018-12-01 19:45:30 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Frédéric FRANCE
335327827d
Update 6.0.0-7.0.0.sql 2018-12-01 00:34:17 +01:00
Frédéric FRANCE
0270da7d8c
Update 5.0.0-6.0.0.sql 2018-12-01 00:28:58 +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
Alexandre SPANGARO
2d55666a0b NEW Add gender in member card 2018-11-18 21:50:58 +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
Laurent Destailleur
7aa042172e Fix sql error 2018-11-14 13:06:40 +01:00
Laurent Destailleur
2985d9cfbf
Update 8.0.0-9.0.0.sql 2018-11-11 17:27:16 +01:00
delcroix Patrick
52f35d8038
to support proposal_supplier insert 
proposal_supplier has 17 char when the elementtype column can take only 16 char
 2018-11-10 14:59:46 +01:00
Laurent Destailleur
f1287578f3 Work on emailcollector 2018-11-09 18:18:17 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +01:00
Laurent Destailleur
eb9defcf1d Debug emailcollector 2018-11-05 16:42:29 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7 Fix emailcollector 2018-11-05 15:31:41 +01:00
Laurent Destailleur
0c7f33e1ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-05 09:56:57 +01:00
Laurent Destailleur
98a3af620b FIX #9934 2018-11-05 09:26:23 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
28d5f1d50b Fix sql syntax error 2018-11-03 11:30:32 +01:00
Maxime Kohlhaas
d1133916e0 Fix tracking field in dictionnary should not be mandatory 2018-11-01 15:33:14 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
c9ef298839 Fix setup template emails 2018-10-31 11:38:04 +01:00
Laurent Destailleur
622f31fd1e Fix ref 2018-10-26 19:01:42 +02:00
Laurent Destailleur
d3893b8b95 Debug v9 2018-10-26 19:00:24 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
Laurent Destailleur
36323752ed Project must be on a dedicated field 2018-10-24 12:00:54 +02:00
atm-greg
ff92572d56 add insurance amount on loan 2018-10-18 17:03:49 +02:00
Laurent Destailleur
c401739fed Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 16:28:03 +02:00
Laurent Destailleur
b4b82ce3d6 Drop both contraint and index 2018-10-09 16:25:57 +02:00
Laurent Destailleur
bde5ee1232
Merge pull request #9621 from ptibogxiv/patch-69 
Prepare for more stripe function
 2018-10-09 16:15:23 +02:00
Laurent Destailleur
b68f6c0fca
Use more generic name 2018-10-09 16:15:12 +02:00
Laurent Destailleur
41f2289ffa Save pos station into invoice 2018-10-08 22:28:30 +02:00
Laurent Destailleur
f9f93f58df Add field to track source module of invoice 2018-10-07 13:49:09 +02:00
Laurent Destailleur
402a383c83 Uniformize field os social networks 2018-10-07 13:31:40 +02:00
Laurent Destailleur
111d589474 NEW Can mix offset before and after with rules for due date of invoices 2018-10-04 16:06:26 +02:00
Laurent Destailleur
56cb0763d1 Add maincolor property on website 2018-10-02 16:46:54 +02:00
Frédéric FRANCE
6f48f37fa0
Update 8.0.0-9.0.0.sql 2018-09-30 10:31:08 +02:00
Laurent Destailleur
a4ec613d73 Move sql table 2018-09-28 19:40:44 +02:00
ptibogxiv
a05bdccb06
Prepare for more stripe function 2018-09-27 10:47:58 +02:00
IJ
68dc213601
Correct Google+ to plus 2018-09-26 07:36:22 +01:00
IJ
c90cd4ae29
Add more social fields 2018-09-26 07:21:21 +01:00
Laurent Destailleur
e6be047178 Work on new management for website module 2018-09-25 15:00:37 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
b341cb9245 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2018-09-12 18:11:51 +02:00
Laurent Destailleur
fd93a22dca Fix missing field 2018-09-12 16:45:12 +02:00
Laurent Destailleur
72895bebbf Add field twitter and facebook 2018-09-12 13:18:03 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Laurent Destailleur
69cf7026eb NEW Close #9296 Add field ref_ext into llx_categorie 2018-09-04 11:29:52 +02:00
Laurent Destailleur
6b3ccddb65 FIX #9396 2018-09-04 10:14:45 +02:00
Laurent Destailleur
c5c0491ea7 Fix restaure behavior account_parent point ro rowid 2018-09-03 12:59:20 +02:00
Laurent Destailleur
bf6463b152 Revert old behaviour 2018-09-03 12:54:20 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Laurent Destailleur
bb2f5ad588 Fix missing migration 2018-09-01 11:30:14 +02:00
Laurent Destailleur
ca2e9f20f6 Fix missing extrafield table 2018-08-31 18:39:13 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-08-28 02:23:34 +02:00
Laurent Destailleur
ad0cc098ee Fix alter forgot 2018-08-28 01:37:25 +02:00
gauthier
79aa390fe8 FIX : table llx_chargessociales doesn't exists 2018-08-27 15:07:19 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Laurent Destailleur
2cbbb6e622 Prepare 8.0.0 release 2018-08-13 23:04:58 +02:00
Laurent Destailleur
f96dd391fa Fix error in foreign key pointing to old table 2018-08-13 16:11:23 +02:00
Laurent Destailleur
d09850522b Fix migration 2018-08-12 22:27:54 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description 
NEW Can record the supplier product description
 2018-08-12 18:56:27 +02:00
John BOTELLA
d6d8f98f38 add retained warranty cond field and add forms 2018-08-10 15:06:00 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
John BOTELLA
06be98c638 add date field 2018-08-08 17:36:39 +02:00
John BOTELLA
3036c94198 Add new situation retained warranty field 2018-08-07 15:18:42 +02:00
atm-greg
be63f0dc89 add migration for desc_fourn 2018-08-07 09:49:57 +02:00
atm-greg
ad5f59822e Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:33:30 +02:00
Regis Houssin
fa32e48b8a FIX change column "account_parent" and missing modify column 2018-08-03 13:53:12 +02:00
Juanjo Menent
788060aa28
Merge pull request #9178 from aspangaro/9.0_a3 
NEW : Add project on salaries
 2018-08-02 11:19:34 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3 2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
Laurent Destailleur
8ab03c469a Fix migration 2018-07-27 13:42:32 +02:00
Frédéric FRANCE
2dd907a8e1
extrafield totalizable 2018-07-26 09:41:44 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Regis Houssin
25c93de801 FIX missing drop old postgresql unique key 2018-07-24 11:23:44 +02:00
florian HENRY
2f2ca16e2b Add DELETE Trigger action into admin event agenda log 2018-07-10 16:44:14 +02:00
Laurent Destailleur
5f52dfa873 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-10 14:02:40 +02:00
Laurent Destailleur
cbc17d4658 Fix ecm when using multicompany 2018-07-10 12:03:51 +02:00
Laurent Destailleur
3a593f88f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-05 10:28:24 +02:00
Laurent Destailleur
5883899bc7 Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-07-05 02:33:39 +02:00
Laurent Destailleur
64e778a78f Fix pgsql migration 2018-07-04 10:26:25 +02:00
Laurent Destailleur
a2f517685e Fix pgsql migration 2018-07-04 10:21:42 +02:00
Laurent Destailleur
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
d8c7c61951 Merge branch '8.0_canvas' of https://github.com/hregis/dolibarr into 
hregis-8.0_canvas

# Conflicts:
#	htdocs/product/canvas/product/tpl/list.tpl.php
 2018-06-30 18:29:08 +02:00
Regis Houssin
718cbce8eb Fix: use "visible" field name instead "checked" 2018-06-30 10:58:08 +02:00
Regis Houssin
4c90ff9917 NEW add "checked" field for new list engine compatibility 2018-06-30 10:54:22 +02:00
Laurent Destailleur
7fab2ca1f8 Add new field 2018-06-30 01:26:33 +02:00
Laurent Destailleur
60c62895bf WIP Can add tooltips on extrafields 2018-06-28 19:13:23 +02:00
Laurent Destailleur
0490807f9b Prepare 9.0 2018-06-28 18:36:08 +02:00
Laurent Destailleur
a30789e423 Fix table name 2018-06-27 00:34:45 +02:00
Laurent Destailleur
aa37786596 Fix migration errors reported by Softaculous 2018-06-26 11:51:49 +02:00
Laurent Destailleur
cbe682582e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-26 01:25:24 +02:00
Laurent Destailleur
5c93fa1bfb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/journals_list.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/other.lang
 2018-06-26 01:25:03 +02:00
Regis Houssin
a6729b0bd1 Fix: change field name and remove obsolete data 2018-06-25 09:10:24 +02:00
Laurent Destailleur
bc71685258 Fix migration error 2018-06-25 08:30:37 +02:00
Laurent Destailleur
c664d0c2fd Fix phpunit 2018-06-24 18:26:35 +02:00
Laurent Destailleur
a50b62d7e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-24 10:26:24 +02:00
Laurent Destailleur
4f533be01a For #9006 2018-06-24 10:26:08 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere 2018-06-24 10:24:26 +02:00
Laurent Destailleur
ac19a6e211
Merge pull request #8993 from hregis/develop_pgsql 
Fix: wrong field name, use "type" instead "llx_c_type_fees"
 2018-06-22 15:09:31 +02:00
atm-quentin
d53aa71673 NEW advance target filtering can be used everywhere with tpl and fk_element 2018-06-22 10:54:00 +02:00
Laurent Destailleur
cfcedc1170 Fix remove old unique key constraint 2018-06-21 00:11:37 +02:00
Regis Houssin
e1db5ab433 Fix: wrong field name, use "type" instead "llx_c_type_fees" 2018-06-19 19:56:39 +02:00
Laurent Destailleur
094b31a563 Complete migration 2018-06-13 21:46:55 +02:00
Alexandre SPANGARO
c7e6ee3a1b Fix : Migration for Romanian chart of accounts 2018-06-10 04:02:35 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
4b58158588
Update 7.0.0-8.0.0.sql 2018-05-29 10:47:14 +02:00
Laurent Destailleur
18898558e4
Merge branch 'develop' into patch-13 2018-05-29 10:46:28 +02:00
Laurent Destailleur
01c8b33483 FIX 8870 2018-05-29 10:18:45 +02:00
Laurent Destailleur
0f50b0ffb1 Code comment 2018-05-29 10:00:08 +02:00
Laurent Destailleur
f3f252e88b Fix duplicate record before creating primary key 2018-05-27 19:31:03 +02:00
Frédéric FRANCE
d67bed57d9
Update 7.0.0-8.0.0.sql 2018-05-26 11:26:20 +02:00
Laurent Destailleur
4a58ae59ed Fix missing drop of old constraint on old table 2018-05-25 15:54:59 +02:00
Laurent Destailleur
ba6193cff7 Add indonesia provinces 2018-05-25 14:57:30 +02:00
Alexandre SPANGARO
cb815e5e3b Update works 2018-05-13 07:50:24 +02:00
Laurent Destailleur
7f704231fe Fix migration script 2018-05-10 14:20:05 +02:00
wdammak
d038bf3e4b
Merge pull request #8 from Dolibarr/develop 
Update rep
 2018-05-06 17:01:44 +01:00
Laurent Destailleur
5fe8249706 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-05-05 23:22:04 +02:00
Laurent Destailleur
a842178689 Fix migration missing steps 2018-05-05 23:20:53 +02:00
Laurent Destailleur
f15da0b980 Fix chart of account initial data for syscohada 2018-05-05 22:15:19 +02:00
wdammak
bca8d0844e
Prepare the adding pdf models to the stock module 2018-05-03 00:38:38 +01:00
Laurent Destailleur
9e18c95a3f Fix migration script 2018-05-02 19:54:07 +02:00
florian HENRY
daf829c9f7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/7.0.0-8.0.0.sql
 2018-05-02 08:49:40 +02:00
Laurent Destailleur
14fd740b04 Fix lang must be '' and not empty in email_template 2018-05-01 16:25:06 +02:00
florian HENRY
c84f44a508 fix accountanty in multientity 2018-05-01 12:30:22 +02:00
Laurent Destailleur
6a76242611 Fix record with date_creation empty 2018-04-30 08:59:07 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
fb8ad77378 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2018-04-23 23:09:53 +02:00
Laurent Destailleur
e834eff049 FIX #8650 2018-04-22 20:03:24 +02:00
Laurent Destailleur
98cb95cc41 Fix deprecated labels 2018-04-21 13:19:12 +02:00
Laurent Destailleur
cc5d54faa5 Doc 2018-04-21 01:41:38 +02:00
Laurent Destailleur
7256edc831 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-18 03:28:50 +02:00
Laurent Destailleur
b39755f7b9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:16:14 +02:00
Laurent Destailleur
013f95f54b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:02:51 +02:00
Laurent Destailleur
e4635c9401 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:40 +02:00
Laurent Destailleur
c7789d2038 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:06 +02:00
Regis Houssin
ad197d01c1 Fix: avoid error 2018-04-17 21:16:17 +02:00
Regis Houssin
bab32e05e7 Fix: best practice for sequence 2018-04-17 21:08:40 +02:00
Regis Houssin
c07b5d684c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_pgsql 2018-04-17 19:37:38 +02:00
Laurent Destailleur
5f3de7f97e Doc 2018-04-17 19:23:05 +02:00
Regis Houssin
955ff14c6f Fix: correct syntax for postgresql 2018-04-17 19:06:14 +02:00
Laurent Destailleur
dd46d97138
Merge pull request #8628 from hregis/develop_multicompany 
Fix: syntax error with postgresql
 2018-04-17 18:55:46 +02:00
Laurent Destailleur
fb81ce5117 Some fixes for postgresl migration 2018-04-17 18:32:04 +02:00
Regis Houssin
6d7bd7ce1e Fix: syntax error with postgresql 2018-04-17 18:26:37 +02:00
Regis Houssin
9a210c1a91 Fix: syntax error for postgresql > 9.1 2018-04-17 17:33:40 +02:00
Regis Houssin
d89086cb7a Fix: missing drop constraint with postgresql 2018-04-17 17:25:54 +02:00
Regis Houssin
dd835c4868 Fix: missing drop index with postgresql 2018-04-17 17:18:59 +02:00
Laurent Destailleur
6450f95c90 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 19:13:38 +02:00
Laurent Destailleur
57c03553dd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-04-15 12:09:07 +02:00
Regis Houssin
79c34f4d69 Fix: project category is type 6 not 5 !! 2018-04-14 10:03:21 +02:00
Laurent Destailleur
a933e458e7 Repair type of product in invoice table from type of product 2018-04-13 22:57:43 +02:00
Laurent Destailleur
3078b890d4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/admin/stripe.php
 2018-04-13 00:45:39 +02:00
Laurent Destailleur
ecd18da137 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-13 00:43:37 +02:00
Laurent Destailleur
4b38cf5329 Fix request at wrong place 2018-04-12 18:30:07 +02:00
florian HENRY
cd2f6616be fix index creation with unique name for pgSQL 2018-04-12 16:41:53 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Alexandre SPANGARO
130f270627 Fix : Migration 7.0.0 don't contains all new chart of accounts. 2018-04-10 21:16:36 +02:00
atm-quentin
cc832bd972 FIX Issue #8455 2018-04-10 15:47:06 +02:00
Laurent Destailleur
0bf4381226 NEW The field "visible" on extrafield can accept expression as condition 2018-04-10 15:39:11 +02:00
Laurent Destailleur
a231074012 Save search criteria when using "back to" on accounting account 
Change type of foreign key to be an integer to avoid CAST in requests
 2018-04-09 11:31:24 +02:00
Laurent Destailleur
419b225120 Clean code 2018-04-07 21:11:58 +02:00
Alexandre SPANGARO
3e66f5e25b Update works 2018-04-06 06:04:03 +02:00
Alexandre SPANGARO
06dc70df09 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-05 20:42:28 +02:00
Alexandre SPANGARO
2a50e9e6c4 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-02 19:54:30 +02:00
Alexandre SPANGARO
dd04dae652 Update work 2018-04-02 14:03:12 +02:00
Regis Houssin
ef45983f73 Fix: just add fields if not exists 2018-04-02 10:25:15 +02:00
Regis Houssin
9f7fcdc8bf Fix: multiple avoid Warning and errors 2018-04-02 10:18:51 +02:00
Alexandre SPANGARO
3779b6ff1c Update work on assets type 2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
a5428cc8c7 NEW Module Assets 2018-04-01 21:26:52 +02:00
Laurent Destailleur
a9ac7e1f29 Debug inventory module 2018-03-31 19:20:38 +02:00
Laurent Destailleur
b5c53e9d76
Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse 
NEW: default warehouse field for products
 2018-03-29 13:51:37 +02:00
Laurent Destailleur
03fe0d6b9e
Update 7.0.0-8.0.0.sql 2018-03-29 13:50:08 +02:00
Laurent Destailleur
af11daf186
Merge pull request #8467 from hregis/develop_bug3 
Fix: missing encrypt for llx_const
 2018-03-29 13:43:53 +02:00
Laurent Destailleur
6ccdb52229 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-29 13:30:22 +02:00
Laurent Destailleur
eee1cd9120 Fix data corrupted by v7 2018-03-29 13:29:23 +02:00
Laurent Destailleur
188e5d286d Fix statut 2018-03-29 13:28:29 +02:00
Marc de Lima Lucio
3646374976 NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders 2018-03-28 11:54:21 +02:00
Regis Houssin
63a5ff61ef Fix: missing encrypt for llx_const 2018-03-28 06:44:17 +02:00
Laurent Destailleur
26e2d3c4f0 Clean permissions tables 2018-03-26 16:35:50 +02:00
Laurent Destailleur
e9c4ae8f01 Add type product/service in type of expense report 2018-03-26 14:52:20 +02:00
Laurent Destailleur
6e32e9961f Syn transifex 2018-03-23 17:56:35 +01:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Laurent Destailleur
b2e4c6cf14 Clean code 2018-03-15 11:53:47 +01:00
Laurent Destailleur
db18db9488 Clean code 2018-03-15 11:27:39 +01:00
Laurent Destailleur
268b07bcf0 Can add/delete credit card localy 2018-03-14 11:51:13 +01:00
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
Laurent Destailleur
3a8ceb130f Fix utf8 on all fields 2018-01-19 15:17:19 +01:00
Laurent Destailleur
dcd579242f Fix <br /> (xml) into <br> (html) 2018-01-17 13:26:57 +01:00
Laurent Destailleur
3f551f0d05 Fix migration 2018-01-17 02:19:32 +01:00
Laurent Destailleur
a84ed841cc Fix creation date was not filled 2018-01-16 20:47:33 +01:00
Laurent Destailleur
7a88afe962 Fix field enabled and perms must differs 2018-01-13 13:16:33 +01:00
Laurent Destailleur
15ed7584b8 Fix navigation in accounting account card 2018-01-11 17:06:06 +01:00
Laurent Destailleur
9844352193 More complete repair 2018-01-08 15:04:17 +01:00
Laurent Destailleur
a37019a25b NEW Add chart of account for england 2018-01-05 22:04:43 +01:00
Laurent Destailleur
ce680af357 Fix field name and length (database portabilit) 2017-12-28 11:16:27 +01:00
Laurent Destailleur
e6c7f9e69b Debug module inventory 2017-12-22 21:29:09 +01:00
Laurent Destailleur
2b056b0177 BUG Fix of old hidden feature price per quantity 2017-12-22 12:53:46 +01:00
dolibarr95
a33411b8bd
Create 7.0.0-8.0.0.sql 2017-12-20 09:06:11 +01:00
Laurent Destailleur
01c99b780e Fix missing index 2017-12-19 16:22:47 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent 
FIX Revenue stamp not visible on the transfer payment page
 2017-12-18 12:43:03 +01:00
fappels
bb700494a1 Fix Collation update missing for llx_expeditiondet_batch 2017-12-13 20:39:37 +01:00
Laurent Destailleur
066e04f33d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2017-12-11 00:22:05 +01:00
Laurent Destailleur
d701a7617b Fix province nadorgg into nador 2017-12-10 19:04:21 +01:00
Laurent Destailleur
cf5265d405 Minor fix 2017-12-07 21:44:12 +01:00
Laurent Destailleur
dc04ab3164 Missing field in website module 2017-12-02 13:24:21 +01:00
Laurent Destailleur
6796c08cb8 Debug/rewrite Blockedlog 2017-11-30 14:21:55 +01:00
Laurent Destailleur
6a8388dd57 Add table for online signature 2017-11-25 14:11:34 +01:00
Laurent Destailleur
d90f68837a Missing migration line 2017-11-25 00:59:25 +01:00
Laurent Destailleur
e22d13cf55
Merge pull request #7860 from IonAgorria/resources-country 
Add country to resource
 2017-11-24 16:35:52 +01:00
Laurent Destailleur
831099fef8 Debug modulebuilder 2017-11-24 16:24:42 +01:00
Laurent Destailleur
9f235e1ff6 Standardize database: field ref of warehouse was renamed label -> ref 2017-11-24 15:27:00 +01:00
Laurent Destailleur
6a3dc91414 Standardize code 2017-11-23 15:22:32 +01:00
Laurent Destailleur
5b77fe393e Fix: contact not preselected 2017-11-23 00:59:43 +01:00
Ion
6428c2157c Add country to resource 2017-11-23 00:26:25 +01:00
Laurent Destailleur
cf0d67d71c Generation of pdf become default value 2017-11-17 23:57:32 +01:00
Laurent Destailleur
d326641072
Merge pull request #7813 from hregis/develop_ldap 
Fix: missing encrypt datafor llx_const
 2017-11-17 13:03:22 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Regis Houssin
a4b96f00df Fix: missing encrypt datafor llx_const 2017-11-14 16:00:34 +01:00
Laurent Destailleur
2d78136781 Standardize field length 2017-11-13 18:04:14 +01:00
Laurent Destailleur
53bfbcf5db NEW Ad performances indexes on calendar events 2017-11-13 17:05:07 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf 
NEW generate also document when invoice is build from recurring template
 2017-11-11 17:42:26 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs 2017-11-09 23:39:28 +01:00
Laurent Destailleur
f6a0603fb0 Clean code/constant 2017-11-09 18:16:15 +01:00
Laurent Destailleur
fa999dfa65
Merge pull request #7742 from aspangaro/7.0-accountancyproductvariant 
NEW Accountancy Add variant on sell account for intracommunity sales & export sales
 2017-11-06 09:25:14 +01:00
Laurent Destailleur
d0e354f729
Merge pull request #7766 from aspangaro/7.0-6 
FIX Missing fields for the table bookeeping_tmp on migration
 2017-11-05 18:38:01 +01:00
Laurent Destailleur
86eb028beb Repair datec empty for products 2017-11-04 15:25:52 +01:00
Alexandre SPANGARO
26cb4bc6f6 FIX Missing fields for the table bookeeping_tmp on migration 2017-11-04 08:10:05 +01:00
Alexandre SPANGARO
7e3103356b Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant 
# Conflicts:
#	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-11-04 07:14:28 +01:00
Laurent Destailleur
4ac8cb9168 Fix sql syntax 2017-11-03 16:31:33 +01:00
Laurent Destailleur
a346a1a5e9 Work on website module 2017-11-03 15:56:16 +01:00
Laurent Destailleur
55386a3ae2 Work on website module 2017-11-03 13:52:03 +01:00
Laurent Destailleur
fa1fbe7db7 Work on websiteaccounts 2017-11-03 13:25:49 +01:00
Alexandre SPANGARO
2d17e4094c Merge remote-tracking branch 'uptream/develop' into 7.0-accountancyproductvariant 
# Conflicts:
#	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-11-03 06:18:27 +01:00
Laurent Destailleur
d137cef843
Merge pull request #7707 from aspangaro/7.0-SPEC1 
SPEC #7013 : use database type "double" to store monetary values
 2017-11-02 09:54:34 +01:00
Laurent Destailleur
9458c80c48 Work on reminders 2017-10-31 23:10:29 +01:00
Alexandre SPANGARO
cc26095467 Update database 2017-10-31 22:04:50 +01:00
Alexandre SPANGARO
a0d186bae6 Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1 2017-10-31 05:53:05 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Alexandre SPANGARO
63707dbe10 Merge remote-tracking branch 'uptream/develop' into 7.0-SPEC1 2017-10-29 06:58:04 +01:00
Alexandre SPANGARO
16e4e8ada1 Fix SPEC1 2017-10-29 06:56:05 +01:00
Laurent Destailleur
5ba64fe620 Merge branch 'develop' into 7.0-pcg6 2017-10-27 01:42:03 +02:00
Laurent Destailleur
315fce701b Fix migration pgsql 2017-10-26 18:46:44 +02:00
Laurent Destailleur
d1e7577eed Fix sql field can't be named 'offset' (reserved word). 2017-10-26 18:30:01 +02:00
Laurent Destailleur
8058712d47 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/contrat/class/contrat.class.php
	htdocs/product/list.php
 2017-10-26 17:06:11 +02:00
Laurent Destailleur
ffee915498 Fix field not serial with pgsql 2017-10-26 15:10:52 +02:00
Laurent Destailleur
66d2c29fe1 Work on modulebuilder and website module 2017-10-26 01:02:13 +02:00
Laurent Destailleur
bb996019c2 NEW Support visibility on extrafields 2017-10-25 11:42:14 +02:00
Alexandre SPANGARO
ecbc393c96 FIX SPEC #7013 : use database type "numeric" to store monetary values 2017-10-24 21:14:31 +02:00
Alexandre SPANGARO
22d2598ea1 NEW Add The Moroccan chart of accounts 2017-10-24 19:23:09 +02:00
Laurent Destailleur
72441de1ec Fix length of fk_mainmenu and fk_leftmenu 2017-10-24 17:35:53 +02:00
Laurent Destailleur
d2f723045c Work on website and modulebuilder 2017-10-24 17:30:05 +02:00
Laurent Destailleur
e58a52c52b Merge branch 'develop' into 7.0-pcg4 2017-10-24 12:59:59 +02:00
Laurent Destailleur
deeebac540 Merge branch 'develop' into 7.0-pcg3 2017-10-24 12:58:09 +02:00
Laurent Destailleur
110f2fc5da Merge pull request #7695 from aspangaro/7.0-pcg2 
NEW Add The Switzerland chart of accounts
 2017-10-24 12:54:48 +02:00
Alexandre SPANGARO
eb6ba2ba55 NEW Add The Tunisia chart of accounts 2017-10-24 07:19:07 +02:00
Alexandre SPANGARO
9e673f7c87 NEW Add The Luxembourg chart of accounts 2017-10-24 07:07:28 +02:00
Alexandre SPANGARO
d43c186777 NEW : Add The accountancy Switzerland chart of accounts 2017-10-24 06:40:54 +02:00
Alexandre SPANGARO
8ba2fb8d4a New : Add The developed accountancy french plan 2014 2017-10-24 06:05:19 +02:00
Laurent Destailleur
9df3f5c75e Migration of data 2017-10-23 19:18:17 +02:00
Laurent Destailleur
f083ac5e6b Prepare database to store country int accounting_system table 2017-10-23 18:56:09 +02:00
Laurent Destailleur
97b694b59c Fix missing field in migration v6 2017-10-23 10:22:45 +02:00
Laurent Destailleur
f675be650e Fix missing field in migration v6 2017-10-23 10:21:45 +02:00
Laurent Destailleur
1fe1cb986a Fix AUTO_INCREMENT PRIMARY KEY does not need NOT NULL 2017-10-22 15:51:07 +02:00
Laurent Destailleur
efb369f857 Merge pull request #7497 from atm-florian/dev_accountancy 
NEW : lettrage in accountancy
 2017-10-22 15:28:53 +02:00
Laurent Destailleur
611f5f638d FIX #7616 2017-10-22 15:07:41 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
9c45e86a1c Introduce main_doc into table of objects to know what is main doc. 
Work on option PROPOSAL_USE_ONLINE_SIGN
 2017-10-19 11:40:40 +02:00
florian HENRY
4273e507c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 
dev_accountancy

Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettrage.php
	htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2017-10-18 09:52:56 +02:00
Laurent Destailleur
463441c808 Fix bad table name 2017-10-12 18:32:10 +02:00
Laurent Destailleur
1fba58b9ce Fix bookmark list 2017-10-12 17:09:17 +02:00
Laurent Destailleur
37272b264c Fix sql 2017-10-11 19:45:18 +02:00
Laurent Destailleur
bcf56e3140 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:19 +02:00
Laurent Destailleur
cd814d420b Fix repair utf8 mix collation 2017-10-11 16:54:17 +02:00
Laurent Destailleur
f93ecc1584 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/projet/activity/perweek.php
	htdocs/projet/element.php
 2017-10-10 11:24:17 +02:00
Laurent Destailleur
4de1ade605 Fix mix collation 2017-10-09 18:15:10 +02:00
Laurent Destailleur
15911a9b64 Fix illegal mix collation 2017-10-09 17:45:08 +02:00
Laurent Destailleur
19de053054 Fix itf8 mix collation 2017-10-09 17:43:57 +02:00
Laurent Destailleur
ce7ce82801 Enhance email template editor 2017-10-08 14:51:10 +02:00
Laurent Destailleur
8e187c2759 Debug module website 2017-10-06 22:49:08 +02:00
Laurent Destailleur
43d85af5ae Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 15:23:10 +02:00
Laurent Destailleur
afc1938676 FIX #7550 2017-10-06 14:28:01 +02:00
Laurent Destailleur
06b18a740e NEW Add date of birth on user card. 
NEW Show expected worked hours on the timesheet form.
 2017-10-06 12:08:01 +02:00
Laurent Destailleur
04a56d4bd9 Fix phpunit 2017-10-05 09:34:09 +02:00
Laurent Destailleur
75a7e086b3 Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element 
New comment generic element
 2017-10-04 11:13:39 +02:00
Laurent Destailleur
f2e0ff0d30 Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict 2017-10-03 17:25:01 +02:00
Laurent Destailleur
97d399595f Add unique key on table to follow leave request counter per type 2017-10-02 17:45:01 +02:00
Regis Houssin
09e71f1390 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-10-02 11:51:27 +02:00
Laurent Destailleur
94ae6c62e6 Add htmlheader field for each page 2017-10-02 00:08:00 +02:00
Laurent Destailleur
9654c4f168 New extrafields are visible into list by default 2017-09-29 13:29:48 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
Laurent Destailleur
8242469e40 FIX The unique index on email templates can work now. 2017-09-27 18:16:28 +02:00
Regis Houssin
20684b4505 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/rapport/pdf_paiement.class.php
	htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
 2017-09-27 17:22:18 +02:00
arnaud
f29ea35dc8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element 2017-09-27 14:56:52 +02:00
Laurent Destailleur
f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-09-26 22:11:00 +02:00
Laurent Destailleur
15c8515d53 Fix default 2017-09-26 19:08:04 +02:00
Laurent Destailleur
7f420f3246 Complete vat rates for india 2017-09-26 10:54:07 +02:00
Laurent Destailleur
4f76545b62 Add missing fields to manage localtax on supplier products 2017-09-26 10:47:08 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
c5287e68b1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/modules/modFournisseur.class.php
 2017-09-25 19:54:27 +02:00
Regis Houssin
d592664150 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-09-25 06:48:26 +02:00
Laurent Destailleur
1bb5408d83 FIX #7464 2017-09-24 22:18:10 +02:00
Laurent Destailleur
63ec14e47d Convert sode to send member info email into new generic email template 
system.
 2017-09-22 20:18:11 +02:00
Laurent Destailleur
f990667b1a NEW Can send email from the member card using email templates. 2017-09-22 17:48:38 +02:00
Laurent Destailleur
57358f0ce5 NEW Provide a way to download a file from a public URL for files in ECM 2017-09-21 14:02:42 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
arnaud
e7bb7a3588 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element 2017-09-18 17:28:03 +02:00
arnaud
9795f48046 NEW comment system working with all objects 2017-09-18 17:27:29 +02:00
Laurent Destailleur
c11ff4a18c FIX #7368 2017-09-18 15:55:25 +02:00
Laurent Destailleur
4c97f5514d FIX #7366 renaming table with pgsql 2017-09-18 15:25:21 +02:00
Laurent Destailleur
0355b0d9ed Merge pull request #7414 from aspangaro/7.0-4 
Accountancy - Finish moving admin to specific menu & some cleaning
 2017-09-18 11:16:36 +02:00
Regis Houssin
a03ef95eaa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql
 2017-09-18 09:11:04 +02:00
Laurent Destailleur
d1fd1df345 Add column position on some dictionaries table 2017-09-17 22:52:29 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Alexandre SPANGARO
c2e1e2491d Accountancy - Finish moving admin to specific menu & some cleaning 2017-09-16 06:53:29 +02:00
Laurent Destailleur
a4086b52ef NEW Can send email from contract card 2017-09-16 01:34:15 +02:00
Laurent Destailleur
ffb3823655 Allow null in stock alert threshold to be compatible with #7162 2017-09-15 23:38:03 +02:00
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +02:00
Laurent Destailleur
e02c220c08 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php
 2017-09-15 11:02:34 +02:00
Laurent Destailleur
24cd407cd3 FIX Missing upgrade of fields 2017-09-14 16:52:33 +02:00
Laurent Destailleur
5d920be880 FIX Upgrade missing on field 2017-09-14 16:51:41 +02:00
Regis Houssin
a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-14 12:07:19 +02:00
Laurent Destailleur
cda8c6e41a Fix ref must be 50 2017-09-12 11:51:51 +02:00
Laurent Destailleur
f0f6df4c90 Fix tables declaration 2017-09-11 15:23:49 +02:00
Laurent Destailleur
1f56800a50 Merge pull request #7341 from atm-arnaud/NEW_task_discussion 
New task discussion
 2017-09-11 15:20:13 +02:00
Regis Houssin
f8938f308d Fix: remove table prefix 2017-09-11 08:17:25 +02:00
Regis Houssin
b5de8da3a6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/modFacture.class.php
 2017-09-11 08:07:55 +02:00
Laurent Destailleur
974f99ddb2 Increase length of title field 2017-09-11 02:54:21 +02:00
Laurent Destailleur
2ae135baf1 NEW Add view of status of template invoice 2017-09-10 20:47:45 +02:00
Laurent Destailleur
e7abb39ee2 NEW Template invoices are visible on the customer tab 2017-09-10 19:28:20 +02:00
Laurent Destailleur
01664a135d Removed not used field 2017-09-10 18:01:34 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
b7197530c2 NEW Each user can edit its own email template (menu tools) 2017-09-08 12:48:01 +02:00
arnaud
82440fd399 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion 2017-09-07 16:24:34 +02:00
arnaud
8906c95eea NEW comments system on task 2017-09-07 16:23:51 +02:00
Regis Houssin
66e548427c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/resultat/clientfourn.php
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-07 10:50:35 +02:00
Laurent Destailleur
53a2ef45a5 Fix upgrade 2017-09-06 22:42:01 +02:00
Laurent Destailleur
451adb077f Fix upgrade 2017-09-06 22:41:29 +02:00
Laurent Destailleur
08eff908bc Fix missing field in some env 2017-09-06 21:39:33 +02:00
Laurent Destailleur
17310da0f8 Fix missing field in some env 2017-09-06 21:39:10 +02:00
Laurent Destailleur
859d0dfe97 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-06 19:24:42 +02:00
Laurent Destailleur
7a6f3d899c Fix initial data 2017-09-06 19:21:46 +02:00
Laurent Destailleur
33e2179b65 FIX SQL injection 2017-09-06 18:17:57 +02:00
Laurent Destailleur
f29a4c1fb1 Make accountancy pages responsive 2017-09-05 20:42:34 +02:00
Laurent Destailleur
f5ccd943f1 Fix mix of collation 2017-09-05 20:13:33 +02:00
Laurent Destailleur
e5400a4a36 Fix translation of extrafields 2017-09-02 13:01:41 +02:00
Laurent Destailleur
c1e54b7e23 Merge pull request #7315 from aspangaro/7.0-f2 
NEW Add project on a various payment
 2017-09-02 00:45:36 +02:00
Laurent Destailleur
d71359b634 Update data 2017-09-01 17:42:04 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
 2017-09-01 17:34:57 +02:00
Laurent Destailleur
e13792a555 Fix data for account categories 2017-09-01 15:31:35 +02:00
Alexandre SPANGARO
c4d2ca661f Merge remote-tracking branch 'uptream/develop' into 7.0-f2 
# Conflicts:
#	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-01 07:24:55 +02:00
Laurent Destailleur
2ab12f54ff Fix install error due to too large column with index 2017-08-31 22:42:14 +02:00
Laurent Destailleur
31a74d448c Work on accounting reports. 2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64 Uniformize code of accounting report 2017-08-31 15:44:36 +02:00
Laurent Destailleur
6a3d110d3a Enhance repair for utf8 mix collation 2017-08-31 14:44:32 +02:00
Laurent Destailleur
9146bb336e Work on merging all payment modes in one page 2017-08-31 03:34:57 +02:00
Regis Houssin
8e8f94df11 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture-rec.class.php
 2017-08-30 19:33:23 +02:00
Alexandre SPANGARO
e081653cef Add fk_projet in table various_payment 2017-08-30 06:38:33 +02:00
Laurent Destailleur
8f01db10a6 Fix setup for india 2017-08-29 13:41:55 +02:00
Laurent Destailleur
e9cdf85286 Fxi repeair of collation 2017-08-29 12:58:18 +02:00
Laurent Destailleur
9312005318 NEW Move accountancy features into a dedicated menu 2017-08-29 12:43:47 +02:00
Laurent Destailleur
b4769d37d6 Increase emailing title length 2017-08-28 00:06:38 +02:00
Laurent Destailleur
3f7eea2e0a NEW Can set language on extrafields 2017-08-27 12:12:02 +02:00
Laurent Destailleur
c08d0aeda5 Clean duplicate accounting account 2017-08-26 21:01:26 +02:00
John
0653a5d177 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_develop_extrafields_facture_rec 2017-08-24 14:35:01 +02:00
Laurent Destailleur
326d3df63f FIX select of category 
FIX pb with extrafield list and key '0'

Conflicts:
	htdocs/core/class/extrafields.class.php
 2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e FIX select of category 
FIX pb with extrafield list and key '0'
 2017-08-24 13:23:15 +02:00
Regis Houssin
1befd9c67f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-08-23 21:05:36 +02:00
Laurent Destailleur
4c243d3b9e Fix index declaration must be moved into the .key.sql files. 2017-08-23 15:18:54 +02:00
Regis Houssin
2f537a1ade Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/charges/index.php
	htdocs/compta/paiement/list.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-08-22 18:49:40 +02:00
John
b18104788e New extrafield on facture_rec 2017-08-22 15:22:41 +02:00
Laurent Destailleur
30c39d246b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-22 11:18:56 +02:00
Laurent Destailleur
206d46cbb7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	scripts/cron/cron_run_jobs.php
 2017-08-22 11:18:17 +02:00
Laurent Destailleur
41ce4886fd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-22 11:15:30 +02:00
Laurent Destailleur
4f6363bff8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-21 00:49:47 +02:00
Laurent Destailleur
188653a85d Work on website module 2017-08-20 18:50:51 +02:00
Laurent Destailleur
1101a1094f Fix translation and migration 2017-08-20 16:07:38 +02:00
Laurent Destailleur
4d46b2ae58 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/filefunc.inc.php
 2017-08-17 22:21:30 +02:00
Laurent Destailleur
d37d1a033a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/bank/bankentries.php
	htdocs/core/lib/admin.lib.php
	htdocs/install/mysql/migration/repair.sql
 2017-08-11 19:56:17 +02:00
Laurent Destailleur
bfa8630feb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-08-07 20:07:36 +02:00
Laurent Destailleur
0bf4ac6fb3 Add missing field fk_supplier_proposal 2017-08-07 20:06:26 +02:00
Laurent Destailleur
0960473c9b More complete repair of unicode field 2017-08-07 15:51:30 +02:00
Laurent Destailleur
1c157c7c3d Fix pb with mix collation. Add a way to fix this in repair. 2017-08-04 21:23:40 +02:00
Laurent Destailleur
e039f7cc22 Complete repair script 2017-08-04 16:37:24 +02:00
florian HENRY
8fd45383e2 NEW : manageme extrafields with multientity 2017-08-04 09:00:11 +02:00
Laurent Destailleur
a8d9dff506 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-31 19:32:08 +02:00
Laurent Destailleur
d2b662c671 Add field fk_user in bookkeeping (the user who valiated the accounting 
document. Will be used for statistics purpose only).
 2017-07-31 19:31:52 +02:00
Regis Houssin
0dc0fe81fc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-31 07:40:01 +02:00
Laurent Destailleur
69357dd91c Merge pull request #7113 from atm-ph/new_develop_expense_report 
NEW Add expense report rules and ik
 2017-07-31 02:33:49 +02:00
Laurent Destailleur
46586f3055 Can export Websites pages. 
Work on export to be able to use the generic declaration of fields.
 2017-07-28 14:54:13 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00
Laurent Destailleur
e5a5d537aa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-26 19:30:45 +02:00
Laurent Destailleur
c6480af217 Enhance the repair script 2017-07-26 18:47:35 +02:00
Laurent Destailleur
7b34859bc8 Fix collation 2017-07-26 16:14:18 +02:00
Regis Houssin
acd5780e32 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-26 08:58:56 +02:00
Laurent Destailleur
fb5a7370bf Add missing field 2017-07-25 21:40:55 +02:00
Laurent Destailleur
5b9ac2a7a9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/index.php
 2017-07-25 21:11:36 +02:00
Laurent Destailleur
c386a02889 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2017-07-25 21:10:08 +02:00
Laurent Destailleur
8b793a261f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2017-07-25 21:08:31 +02:00
Laurent Destailleur
b7c4f1f086 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture.php
 2017-07-25 21:05:15 +02:00
Laurent Destailleur
67a442cd9a Uniformize fields 2017-07-24 11:53:57 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00
Regis Houssin
2efb86b5d8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-23 10:36:14 +02:00
Laurent Destailleur
437d620fe4 Add support of language in website module 2017-07-22 20:01:29 +02:00
Laurent Destailleur
854a6ca3d5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-22 16:40:45 +02:00
Laurent Destailleur
5207b84e8b Fix compatibility with indian IGST/CSGST/SGST 2017-07-22 01:56:38 +02:00
Regis Houssin
26df1389f4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-07-21 20:42:21 +02:00
Laurent Destailleur
3716645b8b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-21 15:03:21 +02:00
Laurent Destailleur
d07741ada1 Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
Laurent Destailleur
aacef21cb8 Can clone a page 2017-07-21 13:38:13 +02:00
Laurent Destailleur
7760594643 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
	htdocs/theme/eldy/style.css.php
	htdocs/websites/class/website.class.php
	htdocs/websites/index.php
 2017-07-20 18:31:58 +02:00
Laurent Destailleur
2f3128410b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-20 16:49:56 +02:00
Laurent Destailleur
84f621fde3 Fix migration on pgsql 2017-07-19 16:31:15 +02:00
Regis Houssin
c8bd11660d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-07-18 15:23:43 +02:00
Laurent Destailleur
6e77dab832 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-18 15:13:15 +02:00
Laurent Destailleur
cfbd47bd78 Fix field null 2017-07-18 14:09:37 +02:00
Maxime Kohlhaas
76eac7ce6a Fix : creating user from member was failing due to column size difference 2017-07-18 10:13:10 +02:00
gauthier
ccbeb162cf FIX : Buying prices must always be in positive valueo 2017-07-17 11:27:57 +02:00
Regis Houssin
9bb1431fd9 Fix: change version 2017-07-16 08:06:58 +02:00
Regis Houssin
200f232164 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-16 07:51:20 +02:00
Laurent Destailleur
75ec7a309c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-15 21:25:14 +02:00
Laurent Destailleur
ab6646d16b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/bank/bankentries.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-07-15 03:54:50 +02:00
Laurent Destailleur
cb87b314be FIX Maxi debug of journalization of bank journal. 2017-07-15 03:41:07 +02:00
Laurent Destailleur
3ac85e10c5 NEW Add mass action "validate" on supplier invoices. 
NEW Add date_valid and date_pointoftax on supplier invoices.
 2017-07-14 14:40:09 +02:00
Laurent Destailleur
652d715fdc Better translation 2017-07-13 18:18:56 +02:00
Laurent Destailleur
3db7bd7624 Fix look and feel v6 2017-07-13 17:44:12 +02:00
Laurent Destailleur
be8e15a777 Prepare fix 2017-07-13 16:25:38 +02:00
Laurent Destailleur
43f6eab2ea FIX #7146 2017-07-13 15:16:17 +02:00
Laurent Destailleur
13cee53384 Update 5.0.0-6.0.0.sql 2017-07-13 14:26:10 +02:00
florian HENRY
67664331e3 Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing 2017-07-12 17:49:44 +02:00
florian HENRY
379a5b9e16 fix : SQL migration in capital letters 2017-07-12 12:35:30 +02:00
Regis Houssin
cb6b81d897 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-11 19:10:22 +02:00
florian HENRY
017b654acd FIX PgSQL 2017-07-11 17:45:16 +02:00
florian HENRY
c85bf18f0e Fix AdvtargetEmailing 2017-07-11 14:47:37 +02:00
Laurent Destailleur
be09c911ce Debug module websites 2017-07-10 23:44:46 +02:00
Laurent Destailleur
bb2dc59c56 More complete request to clean 2017-07-10 11:29:09 +02:00
Laurent Destailleur
3c576dcf21 Fix bad name of tables 2017-07-09 20:57:45 +02:00
Laurent Destailleur
b61f7c0179 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-08 22:17:29 +02:00
Laurent Destailleur
65ea0fc2b4 FIX value of user id filled to 0 in llx_bank_url when recording an 
expense report.
 2017-07-08 22:16:35 +02:00
Laurent Destailleur
a562e5a919 Maxi debug of accountancy ledger page. 2017-07-08 20:52:53 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
552031799d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 19:42:37 +02:00
Laurent Destailleur
b7af0cca63 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/holiday/card.php
 2017-07-07 19:39:57 +02:00
Laurent Destailleur
0a7a092080 FIX Missing ref 2017-07-07 19:17:53 +02:00
Laurent Destailleur
4c1b485d47 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2017-07-07 19:06:25 +02:00
phf
6ab0ec4b1b Fix travis and rename 2 fields 2017-07-07 10:22:37 +02:00
phf
b8865c425f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-05 10:48:01 +02:00
phf
1beec51928 New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE 2017-07-05 10:44:52 +02:00
phf
42183877e8 Fix sql syntax 2017-07-04 09:30:53 +02:00
Laurent Destailleur
9e26e6b0a3 Fix bad value for ref of old contracts 2017-07-03 11:42:17 +02:00
Regis Houssin
3f882cb33a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-07-03 09:24:05 +02:00
Laurent Destailleur
db1d97c9ac Fix bad value for ref of old contracts 2017-07-03 02:09:14 +02:00
Laurent Destailleur
aa1351d483 Fix to be sure database is not created using utf8mb4 (not yet supported) 2017-07-03 01:10:09 +02:00
Laurent Destailleur
efecb32ec9 Fix migration 2017-07-03 00:11:22 +02:00
Laurent Destailleur
b95dea3b50 Fix missing ; 2017-07-02 23:37:52 +02:00
Laurent Destailleur
727085f3ec Fix missing migration column zip 2017-06-30 19:01:49 +02:00
Regis Houssin
fa247ffd98 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-29 08:51:42 +02:00
Laurent Destailleur
c213624c14 Fix migration into product_lot 2017-06-27 16:42:37 +02:00
Laurent Destailleur
3b7667292b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-27 11:59:40 +02:00
Laurent Destailleur
75006f9970 Fix data 2017-06-26 13:30:14 +02:00
Laurent Destailleur
3a6314b1a0 Fix data 2017-06-26 13:29:18 +02:00
Laurent Destailleur
6298436a1b Clean old lot numbers 2017-06-25 02:26:30 +02:00
Laurent Destailleur
64eef9f89c Fix compatibility with pgsql 2017-06-22 11:04:15 +02:00
Regis Houssin
2fffd2fa6f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-06-20 23:26:21 +02:00
Laurent Destailleur
f1701469e0 NEW data files are now also parsed by phpunit for sql syntax 2017-06-20 13:28:34 +02:00
Laurent Destailleur
095155a58b Enhance sql quality. Refused double quotes into sql content. 2017-06-20 10:06:17 +02:00
Regis Houssin
909826e24f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-20 06:25:35 +02:00
Laurent Destailleur
2695cc416e Fix comment 2017-06-19 21:06:16 +02:00
Laurent Destailleur
24f7128742 Fix pb with postgresql 2017-06-19 21:04:46 +02:00
Laurent Destailleur
64d8b97afe Fix sql syntax errors 2017-06-19 20:35:14 +02:00
Laurent Destailleur
099ef585b2 Fix pgsql 2017-06-19 20:07:33 +02:00
Laurent Destailleur
1745d06bb7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-06-19 19:56:16 +02:00
Laurent Destailleur
12d7b92556 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-06-19 19:52:49 +02:00
Laurent Destailleur
bdeddd3617 Fix pgsql migration 2017-06-19 19:48:19 +02:00
Laurent Destailleur
6fb0fc7b71 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 19:42:56 +02:00
Laurent Destailleur
f694939fc7 Fix migration with pgsql 2017-06-19 19:39:37 +02:00
Laurent Destailleur
3c73b426d7 Fix migration. Must make reload only on last version step. 2017-06-19 18:32:18 +02:00
Laurent Destailleur
c8b4ab87cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-19 15:08:10 +02:00
Laurent Destailleur
241ec01adf FIX #7031 missing change column "state_id" since dolibarr 3.5 !! 2017-06-19 15:07:55 +02:00
Laurent Destailleur
cffb368bbd Merge pull request #7030 from aspangaro/6.0-fec3 
Fix : Accountancy - Debug and add information in database
 2017-06-19 15:02:30 +02:00
Regis Houssin
544d051fe3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-19 07:06:57 +02:00
Laurent Destailleur
caf48f32c4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-19 03:01:01 +02:00
Laurent Destailleur
43f25b49a1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-19 03:00:29 +02:00
Laurent Destailleur
5cd5986211 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-19 02:59:49 +02:00
Laurent Destailleur
39419bb411 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-06-19 02:59:16 +02:00
Laurent Destailleur
774c624687 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-06-19 02:58:44 +02:00
Laurent Destailleur
52eeeebac9 Fix bad data in sql dump 2017-06-19 02:57:49 +02:00
Laurent Destailleur
5439390461 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 02:57:12 +02:00
Laurent Destailleur
6fc4dacd42 Fix migration opensurvey 2017-06-19 02:55:33 +02:00
Laurent Destailleur
8d84277e8c Complete repair script 2017-06-19 02:18:04 +02:00
Alexandre SPANGARO
e9b6afd2aa Add last session coding - Add temporaly ledger 2017-06-18 22:17:32 +02:00
Regis Houssin
dcc152d4a4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-18 06:52:20 +02:00
Regis Houssin
a0299042e4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-17 12:05:33 +02:00
Laurent Destailleur
81f1a34112 Revert "Fix SPEC #7013 : use database type "numeric" to store monetary values" 2017-06-16 13:06:35 +02:00
Laurent Destailleur
549bb2c55f Merge pull request #7020 from aspangaro/7.0-1 
Fix SPEC #7013 : use database type "numeric" to store monetary values
 2017-06-16 12:59:52 +02:00
Laurent Destailleur
e813fd2dfa Fix missing key import_key and extraparams 2017-06-16 12:57:30 +02:00
Alexandre SPANGARO
f424f96589 Fix SPEC #7013 : use database type "numeric" to store monetary values 2017-06-16 05:15:00 +02:00
Laurent Destailleur
8b7ca1f280 Fix missing vat_src_code into table of expense report 2017-06-15 21:27:20 +02:00
Laurent Destailleur
097be322a6 Modify code to match new v6 structure. 2017-06-15 19:29:00 +02:00
Laurent Destailleur
71c0be20b9 Change data structure for bookkeeping v6 2017-06-15 10:30:32 +02:00
Regis Houssin
773abff80e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-12 21:24:10 +02:00
Laurent Destailleur
ecf29332f3 Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor 
NEW Blokedlog stuff
 2017-06-12 17:44:27 +02:00
Alexis Algoud
0312d2479d add block info popin, translation, hidden authority feature 2017-06-12 10:26:24 +02:00
Laurent Destailleur
ca324346e4 Update doc 2017-06-11 19:08:40 +02:00
Regis Houssin
8b0354cfdf Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-06-11 16:43:31 +02:00
Laurent Destailleur
5471170a97 Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor 
NEW blockedlog hash and authority
 2017-06-11 15:54:47 +02:00
Regis Houssin
3445c9d329 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/lib/functions.lib.php
 2017-06-11 06:27:49 +02:00
Alexis Algoud
11d2a5538b fix entity default value and add link to download blockchain 2017-06-11 00:03:01 +02:00
Laurent Destailleur
36b18f0300 Save MAIN_VERSION_FIRST_INSTALL that is not erased. 2017-06-10 22:11:12 +02:00
Alexis Algoud
63b3010c2e fix sql 2017-06-10 09:28:07 +02:00
Alexis Algoud
3d5899edf3 final blockedlog init 2017-06-10 09:25:32 +02:00
Regis Houssin
fc08adff0f Fix: syntax error 2017-06-09 14:44:29 +02:00
alexis Algoud
9b3b2e600f init blockedlog trigger and hash store 2017-06-08 17:52:02 +02:00
Regis Houssin
ade915af5f New: add dictionnary sharing (multicompany) 2017-06-08 16:36:42 +02:00
Regis Houssin
1baa620688 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-08 10:33:26 +02:00
Regis Houssin
44dba391c1 New: add dictionnary sharing (multicompany) 2017-06-08 10:24:16 +02:00
Regis Houssin
bb37c2f980 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_transverse
 2017-06-06 13:54:33 +02:00
Laurent Destailleur
4bda7fcafc Merge pull request #6949 from aspangaro/6.0-vat2 
NEW : VAT payment v6 look and feel
 2017-06-06 11:08:50 +02:00
Regis Houssin
7ed0643b52 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 10:54:16 +02:00
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
Alexandre SPANGARO
e547aa8aee NEW : VAT payment v6 look and feel 2017-06-05 15:41:33 +02:00
Alexandre SPANGARO
806d25ae41 Activate multi-journal on expensereport journal 2017-06-05 06:44:53 +02:00
Laurent Destailleur
af01e544d5 Merge branch 'develop' into fix_develop_missing_entity_column 2017-06-03 01:11:49 +02:00
Laurent Destailleur
4e397107e1 Merge pull request #6934 from atm-florian/dev_loancalc 
NEW : Add calculation function for Loan schedule
 2017-06-03 01:10:39 +02:00
atm-ph
70a188c042 Fix missing column entity on llx_accounting_journal after init demo with the bash 2017-06-02 21:45:02 +02:00
florian HENRY
b0f2db7aaa NEW : Add calculation function for Loan schedule 2017-06-02 17:48:29 +02:00
Laurent Destailleur
447db1b324 Fix orphelins for categories tables 2017-06-02 13:46:30 +02:00
Laurent Destailleur
9b4c929d79 NEW Add phpunit to check the engine is defined into sql create files. 2017-06-01 16:09:09 +02:00
Laurent Destailleur
733d1caac6 Correct usage of parameter 'none' in GETPOST 2017-06-01 12:37:16 +02:00
Laurent Destailleur
c9a09adf79 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-05-31 12:50:29 +02:00
Laurent Destailleur
d2813eabbc FIX #6877 
Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-05-29 13:41:59 +02:00
Laurent Destailleur
4824942369 FIX #6877 2017-05-29 13:39:07 +02:00
Laurent Destailleur
1da648402d Merge pull request #6886 from hregis/develop_bug 
Fix: use encrypt for llx_const data
 2017-05-29 10:16:07 +02:00
Laurent Destailleur
d19a8929df Merge pull request #6875 from atm-ph/fix_develop_ref_column_inventory 
Fix missing column ref on migration for inventory
 2017-05-29 10:11:26 +02:00
Laurent Destailleur
e5fe629a0e NEW Extrafields support formulas to be computed using PHP expressions 2017-05-24 22:48:44 +02:00
Regis Houssin
55121c5e05 Fix: use encrypt for llx_const data 2017-05-24 16:35:02 +02:00
Laurent Destailleur
cea98ce5cb Look and feel v6 2017-05-23 15:30:56 +02:00
Laurent Destailleur
80ce8da7a3 Fix migration errors and responsive design 2017-05-23 15:13:52 +02:00
phf
9bc60b8aa5 Fix missing column ref on migration for inventory 2017-05-22 09:26:10 +02:00
Laurent Destailleur
80cbc28385 NEW Add REST API to push a file. 2017-05-20 15:52:36 +02:00
Laurent Destailleur
e340a53f7c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-20 11:58:50 +02:00
Laurent Destailleur
df05980c3a Prepare table of notification per object (exemple agenda events) 2017-05-20 10:42:45 +02:00
Alexandre SPANGARO
1da0959a3a Merge remote-tracking branch 'uptream/develop' into 6.0-grh 2017-05-20 08:03:29 +02:00
Alexandre SPANGARO
4ff9607011 Update table accounting_bookeeping to prepare FEC format and harmonization 2017-05-20 07:56:33 +02:00
Laurent Destailleur
330b9e7038 Merge pull request #6866 from absnc/project_element_shipping 
NEW Enable shipments in Project overview tab
 2017-05-19 17:10:51 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +02:00
absnc
7b784a1dcb Enable shipments for project overview tab 2017-05-19 17:50:10 +11:00
Laurent Destailleur
56989ae5af Add missing fields making not possible to enter reference price of 
products into another currency
 2017-05-17 15:10:45 +02:00
Laurent Destailleur
ce84990414 NEW On invoices generated by template, we save if of source template. 2017-05-16 02:46:19 +02:00
Laurent Destailleur
9b550ae178 Fix migration of accountancy_journal from char to num. 2017-05-14 12:54:26 +02:00
Laurent Destailleur
b5b97816c8 FIX #6803 2017-05-13 14:06:14 +02:00
Laurent Destailleur
6f9e67b1fb Remove no more used constant 2017-05-13 13:08:25 +02:00
Laurent Destailleur
0d11fce834 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-12 15:45:30 +02:00
Laurent Destailleur
5581e5da72 FIX New vat code not correctly implemented if "1 price per customer". 2017-05-12 13:12:17 +02:00
Laurent Destailleur
30cf3f2bda Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/tables/llx_bank_account.sql
 2017-05-11 00:03:06 +02:00
Laurent Destailleur
1c7d9b9d9a Merge pull request #6804 from aspangaro/6.0-multijournal 
New : Accountancy - Add a list to select the bank journal in bank card
 2017-05-10 22:46:30 +02:00
Laurent Destailleur
52de60c49b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-10 18:17:58 +02:00
Laurent Destailleur
002bebd837 Fix missing extraparams make sql syntax error 2017-05-10 18:15:01 +02:00
Laurent Destailleur
fe8d34c73b Add field extraparams on llx_bank_account 2017-05-10 17:50:10 +02:00
Laurent Destailleur
8781f6bcf2 Add vat code on predefined invoice 2017-05-10 14:53:20 +02:00
Laurent Dinclaux
2b7dcfa56d Add missing vat_src_code field to predefined invoices table 2017-05-09 21:07:32 +11:00
Laurent Destailleur
9fe28c9b2c NEW Can disable all overwrote translations in one click. 2017-05-09 10:08:04 +02:00
Alexandre SPANGARO
7c4b47f20d Update works 2017-05-06 08:33:12 +02:00
Alexandre SPANGARO
68aaef2f66 Add list to select journal in bank 2017-05-06 08:06:01 +02:00
Laurent Destailleur
fc5f4007a1 Debug accountancy module. Page for bank journalization is still KO. 2017-05-05 16:54:05 +02:00
Laurent Destailleur
885a636351 Debug new journal list page 2017-05-05 16:35:05 +02:00
Laurent Destailleur
11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
 2017-05-05 14:49:25 +02:00
Laurent Destailleur
f069ef9844 FIX #6767 2017-05-05 09:16:11 +02:00
Laurent Destailleur
f32d19fb73 FIX #6767 serious critical error no login possible 2017-05-05 09:15:14 +02:00
Laurent Destailleur
8009370f04 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/contact/document.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/repair.sql
 2017-05-04 10:01:11 +02:00
Laurent Destailleur
b8f5e93ab0 Debug inventory data model 2017-05-02 21:40:18 +02:00
Laurent Destailleur
0bc46facd7 Add missing vat_src_code on recurring invoices 2017-05-02 21:24:18 +02:00
Laurent Destailleur
31d99bbfe6 Complete event tracked automatically 2017-05-02 12:17:25 +02:00
Laurent Destailleur
b57bf6460b Start debug inventory 2017-04-30 02:34:00 +02:00
Laurent Destailleur
50d65e3a9f Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
 2017-04-29 17:40:47 +02:00
phf
8219ff84c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-04-28 14:45:04 +02:00
Laurent Destailleur
0ba6433a61 Work on module website 2017-04-28 13:10:08 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
e97fae0c43 Fix typo 2017-04-27 12:10:08 +02:00
Laurent Destailleur
1c20bbb287 NEW Add index and constraints keys on supplier proposal detail table 2017-04-26 12:11:33 +02:00
Laurent Destailleur
a2287fd183 Add example of sql request to fix llx_product_price 2017-04-24 13:46:41 +02:00
Laurent Destailleur
e97e202deb NEW Can import users 2017-04-17 04:22:53 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
a73d72f243 Add tables for default values 2017-04-14 10:14:23 +02:00
Laurent Destailleur
9678c2128e Add field langs into extrafields definition table 2017-04-03 10:29:20 +02:00
Laurent Destailleur
cab944a1a1 Merge pull request #6602 from aspangaro/6.0-multijournal 
New : [FP17] Accounting multi-journals
 2017-03-31 17:45:10 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
phf
c3e8a5be62 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-03-28 17:20:50 +02:00
Laurent Destailleur
6bf61c677f FIX #6586 Introduce processing status 2017-03-28 13:20:31 +02:00
Alexandre SPANGARO
fc2b9a858b New : [FP17] Add multijournals in accountancy admin 2017-03-28 06:35:03 +02:00
Alexandre SPANGARO
aa924bf010 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 
# Conflicts:
#	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-03-27 22:35:06 +02:00
atm-ph
76b95aeec0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-03-25 19:15:25 +01:00
atm-ph
e3afa06cf3 Fix inventory sql 2017-03-25 18:01:43 +01:00
Laurent Destailleur
278bbf184c Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input 
New : Add Various payment submodule linked to the accountancy to replace free input in bank
 2017-03-24 22:52:39 +01:00
atm-ph
edc2d39702 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-03-24 17:06:40 +01:00
Laurent Destailleur
f241bfefd0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 20:20:59 +01:00
Laurent Destailleur
53a04703d6 Uniformize code 2017-03-23 16:10:38 +01:00
gauthier
6cecab4c92 FIX : forgottent fk_unit field on llx_supplier_propaldet 2017-03-22 16:43:12 +01:00
Alexandre SPANGARO
6d5578a876 Reactivated constant BANK_DISABLE_DIRECT_INPUT 2017-03-19 20:47:30 +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
Alexandre SPANGARO
0e910616b6 Update table 2017-03-19 07:25:19 +01:00
Laurent Destailleur
5871d59db9 Fix error "Invalid default value for 'date_price'" 2017-03-18 15:25:49 +01:00
Alexandre SPANGARO
8328c04624 2nd step : Add table 2017-03-18 08:12:29 +01:00
Alexandre SPANGARO
16b12b33fc First step : remove BANK_DISABLE_DIRECT_INPUT 2017-03-18 07:24:55 +01:00
Laurent Destailleur
d951114c18 Merge branch 'develop' into NEW_odt_others_objects 2017-03-14 10:44:05 +01:00
arnaud
192a825de8 NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class 2017-03-14 09:25:29 +01:00
Alexandre SPANGARO
c6c07bf9f4 New : Add project to social contributions 2017-03-12 14:32: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
5d18aad15f Add the vat_code on all table of prices 2017-03-04 14:18:04 +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
57b532cdd0 Fix status of opportunity is required if an amount is defined 2017-03-02 12:56:22 +01:00
Laurent Destailleur
8487f0fc96 Fix missing setup of new option 2017-03-01 11:18:11 +01:00
Laurent Destailleur
0f22beb774 Upgrade to ckeditor 4.6.2. 2017-02-28 10:49:58 +01:00
Laurent Destailleur
1ef899dacc Prepare database to follow supplier discounts 2017-02-24 15:22:32 +01:00
Laurent Destailleur
a0fb53d5b1 Merge branch 'develop' into NEW_pdf_supplier_payment 2017-02-22 14:20:47 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
847f408508 More complete repair 2017-02-17 20:47:22 +01:00
arnaud
4ec664029d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment 2017-02-17 16:40:14 +01:00
Alexandre SPANGARO
c06aedc54d [FP17] : Add data in llx_accountancy_journal 2017-02-15 20:55:52 +01:00
arnaud
977c18513d FIX pdf supplier payment work 2017-02-14 12:00:56 +01:00
Laurent Destailleur
f4e64685e8 Merge pull request #6397 from apachler/develop 
added additional payment terms often needed in Austria
 2017-02-08 16:47:40 +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
e1a6e6e4ab Rename "attributes" into "variants" to avoid confusion with extrafields 2017-02-08 12:37:38 +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
31c3398b7f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/modules.php
 2017-02-08 10:59:05 +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
d06fb423c0 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/fourn/commande/card.php
#	htdocs/fourn/facture/card.php
#	htdocs/langs/en_US/products.lang
 2017-02-02 20:07:41 +01:00
Laurent Destailleur
218e49298a Uniformize field names 2017-01-31 14:10:06 +01:00
Laurent Destailleur
4cec071af5 Add tms field 2017-01-31 14:00:53 +01:00
Laurent Destailleur
fcfea4e6d1 Add missing field fk_user_modif 2017-01-27 13:26:31 +01:00
Laurent Destailleur
29df2c9115 Merge branch 'develop' into mail-lines 2017-01-27 01:29:58 +01:00
Marcos García de La Fuente
d09a3628c5 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/compta/facture.php
 2017-01-14 23:59:14 +01:00
Alexis Algoud
65b956b011 NEW sql for inventory 2017-01-09 10:33:33 +01:00
Laurent Destailleur
e9853f3cd7 Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into 
Franck-MOREAU-develop

Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
	htdocs/loan/card.php
	htdocs/loan/class/loan.class.php
	htdocs/projet/element.php
 2017-01-07 17:45:05 +01:00
Laurent Destailleur
728dd3f7b3 Add field ref into ecm_files table. 2017-01-03 11:06:24 +01:00
Laurent Destailleur
598e559563 Fix migration 2017-01-02 19:30:12 +01:00
Laurent Destailleur
afe5c6b296 Fix migration 2017-01-02 18:44:11 +01:00
Ion Agorria
522fb4cf7a Add email template for each line in object 2016-12-31 17:39:01 +01:00
Laurent Destailleur
f1961b0207 Work on sorting/indexing upload files 2016-12-31 03:43:22 +01:00
Laurent Destailleur
b5c815367c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 2016-12-26 15:44:31 +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
cb4e0233b9 Fix orphelins 2016-12-23 15:21:38 +01:00
Laurent Destailleur
08449a2d4f Prepare action tracking on products 2016-12-20 12:05:00 +01:00
Laurent Destailleur
78bf209119 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 2016-12-18 02:21:57 +01:00
Laurent Destailleur
e1a5a90f0a NEW Uploaded files are indexed into database 2016-12-13 00:15:21 +01:00
Laurent Destailleur
71d2ee3aa9 Fix default of a column 2016-12-12 20:30:21 +01:00
Juanjo Menent
829ff2299e Fix: Delete surplus migration file 2016-12-10 12:46:26 +01:00
Laurent Destailleur
3396dfc7f6 NEW Index upload files into database. 2016-12-08 22:12:45 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
Laurent Destailleur
888c4cd2ad Fix corrupted value for pointoftax field 2016-12-03 20:15:56 +01:00
Laurent Destailleur
17bc24e83e Complete repair 2016-12-03 20:05:49 +01:00
Laurent Destailleur
fb2f33cfac FIX Clean corrupted data 2016-12-03 19:48:08 +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
39c2088aa5 Fix constant 2016-11-29 11:23:15 +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
e6fb118155 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-11-26 15:52:17 +01:00
Laurent Destailleur
b63ad019ce Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-26 15:49:11 +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
44aa601848 again revert to fk_project instead of fk_projet 2016-11-16 11:11:50 +01:00
florian HENRY
a251f0df51 Various fix on Loan and project link 2016-11-16 09:38:13 +01:00
moreauf
f97bab6fb8 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-15 08:35:25 +01:00
moreauf
081be37787 NEW: Add project and Hook to Loan 
BUG: Correct discard_closed parametters management in project
 2016-11-14 19:25:50 +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
Regis Houssin
a1cccc021e Fix: missing encrypt data for llx_const 2016-11-12 09:48:34 +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
69fe2bfad6 Fix a case of corrupted data 2016-10-29 17:16:14 +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
Laurent Destailleur
d18097da28 Prepare database to manage different vat rate with same rate value. 2016-10-21 14:09:11 +02:00
florian HENRY
54a154fa4f NEW : Add ressource extrafields 2016-10-19 22:14:51 +02:00
Laurent Destailleur
850a275b47 Fix duplicate accounting account with same number. Add unique key. 2016-10-14 18:46:30 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
gauthier
805b65addd FIX : semicolon 2016-10-14 12:02:24 +02:00
gauthier
416311a7b9 NEW : allow to save a parent warehouse 
# Conflicts:
#	htdocs/product/stock/card.php
 2016-10-14 11:29:14 +02:00
Laurent Destailleur
c908af6758 Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month 
NEW Develop new cdr (current or next month) for payment terms.
 2016-10-07 00:06:59 +02:00
Laurent Destailleur
a91f93eeda Merge pull request #5831 from atm-florian/dev_fix5764_for_PgSQL 
FIX : New add limit stock product by warehouse #5764 for PgSQL
 2016-10-07 00:00:53 +02:00
Laurent Destailleur
9ad96c2be3 Debug module accountancy expert 2016-10-05 20:50:47 +02:00
Laurent Destailleur
dff7f73dc9 Better terminology 2016-10-05 18:31:55 +02:00
Laurent Destailleur
31ce725d73 Maxi debug of accountancy expert module 2016-10-04 19:31:05 +02:00
gauthier
71eb4ff1a0 NEW : ALTER TABLE in migration script 2016-10-04 16:07:23 +02:00
Laurent Destailleur
3599f2c840 Uniformize code for recurring invoices 2016-10-04 12:31:45 +02:00
florian HENRY
d3146234b8 FIX : New add limit stock product by warehouse #5764 for PgSQL 2016-10-04 09:23:13 +02:00
Laurent Destailleur
45a808e034 NEW Generation of document is available on member card 2016-10-03 00:08:47 +02:00
Laurent Destailleur
96426de416 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 19:25:35 +02:00
Laurent Destailleur
56ae7bf328 Merge pull request #5822 from aspangaro/4.0-p1 
Fix: Not remove expensereport from menu. Menu of the module still in module file descriptor
 2016-10-01 19:00:41 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
b45ea754ec FIX #5748 Bug: Error updating to 4.0.1 with Postgresql. Field must be 
varchar.
 2016-10-01 16:58:35 +02:00
Laurent Destailleur
fcb00dbaf2 Fix missing unique key 2016-10-01 16:53:33 +02:00
aspangaro
34cad213da Fix: Not remove expensereport from menu. Menu of the module still in module file descriptor. 2016-10-01 07:37:26 +02:00
Laurent Destailleur
2a6d8e77db FIX Lost filter on opportunities 2016-09-30 11:45:36 +02:00
Laurent Destailleur
8fc857fdcb Missing entity in the bookkeeping table 2016-09-29 10:10:32 +02:00
arnaud
c904b8030c Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD 
Conflicts:
	htdocs/langs/en_US/users.lang
 2016-09-27 15:25:29 +02:00
arnaud
b717d530cd NEW User date of employment added 2016-09-27 15:16:16 +02:00
Laurent Destailleur
0ab3728276 Merge pull request #5780 from aspangaro/5.0-p14 
Review of subscription
 2016-09-26 01:09:50 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00
Laurent Destailleur
3eaec4d4b8 Uniformise fields in tables 2016-09-23 10:55:44 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
gauthier
576ef9e541 FIX : sql syntax for travis test 2016-09-21 09:31:40 +02:00
gauthier
d508d44fef NEW : migration script from 4.0.0 to 5.0.0 and langs 2016-09-20 12:10:25 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
 2016-09-19 14:05:16 +02:00
Laurent Destailleur
97e396af69 Work on module website 2016-09-17 21:03:20 +02:00
Laurent Destailleur
20141ec9bc Fix default value of new table 2016-09-12 17:31:36 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +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