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

4847 Commits

Author SHA1 Message Date
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +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
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Regis Houssin
28360f6710 FIX add to migrate_delete_old_files 2018-10-28 09:41:11 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02: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
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31: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
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
36323752ed Project must be on a dedicated field 2018-10-24 12:00:54 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
atm-quentin
96d0bb8f2e FIX adapt develop 2018-10-23 14:31:58 +02:00
Laurent Destailleur
b7d91c30d9 FIX missing symbol for indian rupies 2018-10-23 12:38:12 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
atm-greg
ff92572d56 add insurance amount on loan 2018-10-18 17:03:49 +02:00
atm-quentin
83c8a78628 NEW auto event msg 2018-10-15 17:08:28 +02:00
Laurent Destailleur
eff0e959b3 Fix duplicate column 2018-10-10 13:06:54 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2018-10-10 01:51:54 +02:00
Laurent Destailleur
df0ec95b22 Code comment and better error message 2018-10-09 21:21:10 +02:00
Laurent Destailleur
9fe3e7b6c0 Fix phpunit 2018-10-09 17:09:33 +02:00
Laurent Destailleur
1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-10-09 17:07:32 +02:00
Laurent Destailleur
dc498173c8 Code comment 2018-10-09 16:58:55 +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
422af361b4
Merge pull request #9622 from ptibogxiv/patch-68 
Prepare for more stripe function
 2018-10-09 16:14:35 +02:00
Laurent Destailleur
65b48b06d9
Update llx_paiement.sql 2018-10-09 16:14:28 +02:00
Laurent Destailleur
94743d50be
Merge pull request #9707 from aspangaro/9.0_FEC 
NEW Add FEC Export in accountancy
 2018-10-09 13:05:20 +02:00
Laurent Destailleur
41f2289ffa Save pos station into invoice 2018-10-08 22:28:30 +02:00
Alexandre SPANGARO
75b9862c14 New : Add FEC Export in accountancy 2018-10-08 21:01:21 +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
3a0d777df7
Merge pull request #9649 from lex111/replaces-load 
Replace multiple load calls with loadLangs method
 2018-10-04 17:05:48 +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
atm-quentin
00f532c436 validation modèle de données 2018-10-04 09:50:39 +02:00
atm-quentin
52717dbb65 NEW debut rename stock conf 2018-10-03 18:05:22 +02:00
atm-quentin
41d8cb87a3 debut reception setup page 2018-10-03 12:22:41 +02:00
Laurent Destailleur
56cb0763d1 Add maincolor property on website 2018-10-02 16:46:54 +02:00
Laurent Destailleur
53b0ac8217 Rename template 2018-10-01 21:25:51 +02:00
Laurent Destailleur
af497271a4 Rename template website 2018-10-01 21:00:54 +02:00
Laurent Destailleur
a8f16f6570 Update template web site 2018-10-01 20:59:17 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Frédéric FRANCE
2b8ec8db1f
Update llx_takepos_floor_tables.sql 2018-09-30 10:33:52 +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
ptibogxiv
78b8881c44
Prepare for more stripe function 
support refund, dispute, capture....
 2018-09-27 10:43:43 +02:00
Carsten Brandt
fee46ac845 Update german accounting file to use rowid 
- fix "TODO Fix this file to use rowid"
 2018-09-27 09:39:00 +02:00
Laurent Destailleur
0004cbde96
Merge pull request #9617 from cebe/fix-german-account-rowids 
Update german accounting file to use rowid
 2018-09-27 09:36:09 +02:00
Carsten Brandt
73ed340766
Update german accounting file to use rowid 
- fix "TODO Fix this file to use rowid"
 2018-09-26 11:52:06 +02:00
IJ
68dc213601
Correct Google+ to plus 2018-09-26 07:36:22 +01:00
IJ
9fd7d98c26
Add social fields 2018-09-26 07:35:26 +01:00
IJ
d063f6fdeb
Add social fields 2018-09-26 07:34:09 +01:00
IJ
c90cd4ae29
Add more social fields 2018-09-26 07:21:21 +01:00
Laurent Destailleur
c2335c0a5e Update websote template 2018-09-26 00:17:53 +02:00
Laurent Destailleur
e6be047178 Work on new management for website module 2018-09-25 15:00:37 +02:00
Laurent Destailleur
e07ce644e8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/langs/en_US/admin.lang
 2018-09-18 11:49:35 +02:00
Laurent Destailleur
2d8eb034e3 FIX Maxi debug to allow to load chart of account with multicompany 2018-09-17 21:02:07 +02:00
Laurent Destailleur
b4264ee0a0 Use font awesome for sort image 2018-09-12 21:57:32 +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
af2e19eba8 Replace skype module with social networks module to support more fields 2018-09-12 10:55:45 +02:00
Laurent Destailleur
538a2cc647 NEW Add first template of website 2018-09-08 13:55:15 +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
f2ec94e9fd FIX #9353 Bug: html error - div inside span on graphs 2018-09-04 11:13:54 +02:00
Laurent Destailleur
6b3ccddb65 FIX #9396 2018-09-04 10:14:45 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2018-09-03 14:06:51 +02:00
Laurent Destailleur
47655f0725 Add comment as FIXME 2018-09-03 14:00:12 +02:00
Laurent Destailleur
d050c0654b FIX Add "-- ADD xxx to rowd" to avoid rowid conflict on account chart 2018-09-03 13:14:25 +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
c423aebdad Revert "FIX "account_parent" is linked with "account_number" instead rowid" 
This reverts commit b1a340b193.
 2018-09-03 12:51:20 +02:00
Laurent Destailleur
e9f3c131ec Add the line -- ADD xxx to rowid 2018-09-03 12:42:26 +02:00
Laurent Destailleur
3593b5ac51 Revert "Revert " New:Algerian Chart of accounts"" 
This reverts commit 1d644a33a3.
 2018-09-03 12:39:01 +02:00
Laurent Destailleur
1d644a33a3
Revert " New:Algerian Chart of accounts" 2018-09-03 11:42:01 +02:00
Bahfir Abbes
09b75fc53e
Update llx_accounting_account_dz.sql 2018-09-02 16:52:41 +01:00
Abbes Bahfir
28a146fb5e New:Algerian Chart of accounts - First version 2018-09-02 16:44:07 +01: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
872273ef95
Update fileconf.php 2018-08-29 21:46:39 +02:00
Steve
642f5fd343
Merge pull request #2 from Dolibarr/develop 
update 28/8/2018
 2018-08-28 08:29:09 +02:00
Laurent Destailleur
9c6ce4b29d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-28 02:36:15 +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
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
torvista
710ce6a9f7 Add description to database prefix field to avoid confusion when not specifying a database prefix. 2018-08-19 00:09:34 +02:00
torvista
8426f0e6cb Main url auto-filled field was hardcoded as http: easy to overlook this when running installer via https. 
This sets protocol to be the same as the installer page.
 2018-08-18 23:45:20 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
4c52384609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-16 14:47:56 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +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
florian HENRY
20309665e6 fix : ODT project substitution 2018-08-14 10:45:08 +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
Frédéric FRANCE
1b27cca91c
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-13 08:53:07 +02:00
Laurent Destailleur
d09850522b Fix migration 2018-08-12 22:27:54 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 19:54:03 +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
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Frédéric FRANCE
62b83412ee
test phpcs v3 2018-08-09 11:31:48 +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
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +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
atm-greg
fc705e8510 Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:31:41 +02:00
atm-greg
7063850034 add sql field 2018-08-06 16:32:25 +02:00
Regis Houssin
b1a340b193 FIX "account_parent" is linked with "account_number" instead rowid 2018-08-03 14:01:00 +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
Juanjo Menent
99f29a9764
Revert "FIX multicompany compatibility !" 2018-08-02 10:45:15 +02:00
Juanjo Menent
e6f416e745
Merge pull request #9147 from hregis/7.0_price 
FIX multicompany compatibility !
 2018-08-02 10:45:01 +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
Laurent Destailleur
7af42c66cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
 2018-07-27 12:54:45 +02:00
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
Frédéric FRANCE
c991a4d204
trim trailing 2018-07-26 18:05:20 +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
Laurent Destailleur
68ad5d780c
Merge pull request #9142 from hregis/8.0_pg 
FIX missing drop old postgresql unique key
 2018-07-24 17:16:55 +02:00
Regis Houssin
835cb04631 FIX remove rowid for multicompany compatibility 2018-07-24 17:07:08 +02:00
Regis Houssin
d4920521b5 FIX multicompany compatibility ! 2018-07-24 15:44:21 +02:00
Regis Houssin
25c93de801 FIX missing drop old postgresql unique key 2018-07-24 11:23:44 +02:00
Regis Houssin
5cdc9db1f8 FIX add html comment 2018-07-20 18:45:52 +02:00
Regis Houssin
719db2574e FIX check if "confirmed" mode 2018-07-20 18:39:18 +02:00
Regis Houssin
e9d9954380 FIX do not convert llx_const if mysql encrypt/decrypt is used 2018-07-20 18:33:14 +02:00
Regis Houssin
984a8e3720 FIX disable/enable foreign key checking for avoid errors 2018-07-20 17:28:32 +02:00
Laurent Destailleur
f747cefda3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:44:44 +02:00
Laurent Destailleur
45a45b0dec NEW Can enable a module, even external module, from command line 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:35:00 +02:00
florian HENRY
2f2ca16e2b Add DELETE Trigger action into admin event agenda log 2018-07-10 16:44:14 +02:00
Laurent Destailleur
64517d4c0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-07-10 14:06:51 +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
c01975a40b
Merge pull request #9084 from torvista/texts-setup-en_US 
Texts corrections /langs/en_US
 2018-07-10 10:41:28 +02:00
Laurent Destailleur
d3d1b6d513 NEW Can enable a module, even external module, from command line 2018-07-09 13:02:01 +02:00
Steve
65e42522d3 minor html and css corrections (as shown by browser validation and phpstorm inspections) 2018-07-07 23:50:41 +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
9842978b85 Fix trim config values 2018-07-04 11:16:45 +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
d4d9a8d75a Fix 8.0 not 9.0 2018-07-03 20:13:30 +02:00
Laurent Destailleur
38cd5180d9 FIX for migration from old versions 2018-07-03 20:11:59 +02:00
Laurent Destailleur
275f981545 FIX for migration from old versions 2018-07-03 20:08:55 +02:00
Laurent Destailleur
dfc42e56d3 Better log 2018-07-03 17:15:52 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00
Laurent Destailleur
7ef6b16d31 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/step1.php
 2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-03 10:01:30 +02:00
Laurent Destailleur
c2499f298c Fix bad name of field 2018-07-02 18:08:55 +02:00
Laurent Destailleur
0f77e3c05c Fix bad name of field 2018-07-02 17:57:32 +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
e01d748527 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-30 02:05:13 +02:00
Laurent Destailleur
400d400b32 Fix bad constructor 2018-06-30 01:59:54 +02:00
Laurent Destailleur
31396739f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-30 01:26:59 +02:00
Laurent Destailleur
7fab2ca1f8 Add new field 2018-06-30 01:26:33 +02:00
Laurent Destailleur
a9e78f27d9
Merge branch 'develop' into patch-115 2018-06-30 01:21:58 +02:00
Laurent Destailleur
202ab93c5f
Update 7.0.0-8.0.0.sql 2018-06-30 01:20:57 +02:00
Laurent Destailleur
7984316142
Update 7.0.0-8.0.0.sql 2018-06-30 01:20:44 +02:00
Laurent Destailleur
3112244529
Merge pull request #8884 from defrance/patch-117 
New : fichinter models (like factureRec)
 2018-06-30 01:19:03 +02:00
Laurent Destailleur
a850e91bcb
Merge pull request #9017 from grandoc/new_branch_27_06_2018 
clean and update code
 2018-06-29 19:41:22 +02:00
Laurent Destailleur
3f2b3c0840 FIX #9032 2018-06-29 19:38:12 +02:00
Laurent Destailleur
c4143763be
Update step1.php 2018-06-29 19:23:17 +02:00
Regis Houssin
41709f07d0 Fix: #9032 Vulnerability 2018-06-29 18:18:10 +02:00
Laurent Destailleur
60c62895bf WIP Can add tooltips on extrafields 2018-06-28 19:13:23 +02:00
Laurent Destailleur
f5ea130562 Prepare v9 2018-06-28 18:39:24 +02:00
Laurent Destailleur
0490807f9b Prepare 9.0 2018-06-28 18:36:08 +02:00
Philippe GRAND
a952b46d8b clean and update code 2018-06-27 12:37:31 +02:00
Laurent Destailleur
a076d4b461 Fix translation during install 2018-06-27 01:53:36 +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
a78ba20c9b Fix: update price format 2018-06-25 12:20:08 +02:00
Regis Houssin
3d9b191806 Fix: restore and update example data 2018-06-25 12:16:02 +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
3615b7b45d Fix missing translation 2018-06-24 15:44:13 +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
hythamsoliman81
f461ab5f96 SQL synatx error at llx_website_page.sql 2018-06-17 00:12:06 +02:00
Laurent Destailleur
df28be443b Add syslog module in list of module reloaded in last migration step 2018-06-14 23:00:42 +02:00
Laurent Destailleur
4900f1f1f1 Fix sql coding style 2018-06-13 23:10:29 +02:00
Laurent Destailleur
094b31a563 Complete migration 2018-06-13 21:46:55 +02:00
Laurent Destailleur
ed41731a50
Merge pull request #8954 from mwelters/develop 
German Accounting Plan SKR03 and SKR04 (mysql/data)
 2018-06-13 21:45:02 +02:00
Laurent Destailleur
c09e69aeb6
Update llx_accounting_abc.sql 2018-06-13 21:44:43 +02:00
Laurent Destailleur
074ada10e6
Merge pull request #8940 from aspangaro/8.0-b33 
Fix : Migration for Romanian chart of accounts
 2018-06-13 21:37:50 +02:00
Laurent Destailleur
1e488a6f7f
Merge pull request #8924 from dtix/patch-1 
Romania vat rate changed
 2018-06-13 20:01:48 +02:00
Markus Welters
885904132c
Update llx_accounting_abc.sql 2018-06-13 09:37:12 +02:00
Laurent Destailleur
64537ba9bf Fix missing field in install 2018-06-11 09:20:26 +02:00
Alexandre SPANGARO
c7e6ee3a1b Fix : Migration for Romanian chart of accounts 2018-06-10 04:02:35 +02:00
markus
f3a7e2205b fix typo 2018-06-09 19:07:33 +02:00
markus
9ce10ccef7 Adding SKR03 and SKR04 2018-06-09 19:00:24 +02:00
Laurent Destailleur
d10c9cf565 FIX dir for modules must not have s at end (fix contracts into contract) 2018-06-06 23:47:48 +02:00
dtix
e6da000ae8
Romania vat rate changed 2018-06-06 14:48:11 +03:00
Laurent Destailleur
e7f6a5112c Bad picto 2018-06-05 09:02:50 +02:00
Laurent Destailleur
7c82c74b6b Fix install check 2018-06-05 08:57:04 +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
BENKE Charlene
a85ba00d2e
Create llx_fichinterdet_rec.sql 2018-05-28 16:42:19 +02:00
BENKE Charlene
0b7342f34b
Create llx_fichinter_rec.key.sql 2018-05-28 16:41:45 +02:00
BENKE Charlene
17016d03fe
Create llx_fichinter_rec.sql 2018-05-28 16:40:36 +02:00
BENKE Charlene
8124ea1522
Delete llx_fichinter_rec.sql 2018-05-28 16:39:56 +02:00
BENKE Charlene
eef8249ad7
Create llx_fichinter_rec.sql 2018-05-28 16:39:40 +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
Frédéric FRANCE
af73e6cd4d
Update llx_paiementfourn.sql 2018-05-26 11:23:49 +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
dtix
cca1d26943
Romanian chart of account added 2018-05-22 11:23:59 +03:00
dtix
63e056064e
Create llx_accounting_account_ro.sql 2018-05-22 11:22:04 +03:00
Alexandre SPANGARO
cb815e5e3b Update works 2018-05-13 07:50:24 +02:00
BENKE Charlene
fcf6ab6ee5
Update 7.0.0-8.0.0.sql 2018-05-12 17:55:14 +02:00
BENKE Charlene
468635867d
Add dateemployementend 2018-05-12 17:52:56 +02:00
Laurent Destailleur
7f704231fe Fix migration script 2018-05-10 14:20:05 +02:00
Laurent Destailleur
3c6d1ccbac
Merge branch 'develop' into develop 2018-05-10 13:13:53 +02:00
Abbes Bahfir
de8bd3f886 New : Translate accountancy journal menu entries 2018-05-07 08:43:41 +01: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
Laurent Destailleur
9aaf5b95a7
Merge pull request #8745 from wdammak/patch-5 
Update llx_entrepot add model_pdf
 2018-05-05 12:50:36 +02:00
wdammak
468f970d32
Update llx_stock_mouvement Add model_pdf 2018-05-04 18:10:55 +01:00
wdammak
e34bd1a222
Update llx_entrepot add model_pdf 2018-05-04 18:08:04 +01: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
f50a6149d5 Look and feel v8 (menu statistics at end) 2018-05-01 11:09:03 +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
06cbc19103 Add meta generator in install pages 2018-04-22 12:10:53 +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
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
e7f6785a53 Add log 2018-04-16 12:23:24 +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
Laurent Destailleur
f9382ce395 Upgrade octicons 2018-04-15 11:27:39 +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
300d6962d9 Fix step5 upgrade process 2018-04-13 17:05:35 +02:00
Laurent Destailleur
fbae4429b7 Clean code for better extrafields management 2018-04-13 12:52:23 +02:00
Laurent Destailleur
0bbe7043ef Fyx syntax error 2018-04-13 00:58:23 +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
664f57a5f0 Clean code 2018-04-12 19:13:06 +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
florian HENRY
def28be0ab fix error on first install pgsql 2018-04-12 16:36:04 +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
Laurent Destailleur
9a83a6ad6e
Merge pull request #8546 from atm-quentin/FIX_Issue_8455 
FIX Issue #8455
 2018-04-11 17:26:13 +02:00
Laurent Destailleur
1feee6378f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 14:45:52 +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
Regis Houssin
89ec185f51 Fix: avoid Error: Call to undefined method mysqli::get_charset() 2018-04-09 12:53:03 +02:00
Regis Houssin
976b5c26c7 Fix: TODO get_charset() function don't exists 2018-04-09 12:26:39 +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
619805c7a5 Update works 2018-04-05 20:40:41 +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
6d796cfd26
Update llx_product.sql 2018-03-29 13:50:29 +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
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-03-19 17:58:19 +01:00
Laurent Destailleur
39228f6221 South africa vat rates 2018-03-18 23:37:46 +01:00
Laurent Destailleur
8223047d4a South africa vat rates 2018-03-18 23:37:28 +01:00
Regis Houssin
c0a6ae2195 Fix: replace with dolibarr_install_syslog 2018-03-16 18:31:11 +01:00
Laurent Destailleur
545bfeedcc Minimum PHP version for 8.0 is PHP 5.4 2018-03-16 01:25:34 +01:00
Regis Houssin
6e585869c7 Fix: better method for avoid lost global 2018-03-15 19:33:08 +01:00
Regis Houssin
9f62ddaf36 Fix: missing update of $conf 2018-03-15 19:24:34 +01:00
Laurent Destailleur
c83b0bd53c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 15:11:35 +01:00
Laurent Destailleur
c4ca4a5a16 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/install/mysql/data/llx_accounting_category.sql
 2018-03-15 15:11:18 +01:00
Laurent Destailleur
c9566e9501
Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
85e307d6b8 Fix report when group is not dedicated to a country 2018-03-15 12:31:24 +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
Alexandre SPANGARO
9ce6ab915c Merge remote-tracking branch 'uptream/develop' into 8.0-a9 2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +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
ptibogxiv
d6be9651a0
ADD key_account variable for stripe or other gateway 2018-03-13 00:29:28 +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
Frédéric FRANCE
478b3dfa42
Update llx_ticketsup.sql 2018-03-12 08:34:47 +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
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
c1d148458b Fix migration 2018-03-09 23:44:00 +01:00
Laurent Destailleur
3ad95e46c0 Fix phpunit 2018-03-08 22:40:42 +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
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +01:00
Laurent Destailleur
1f67e115d7
Merge pull request #8239 from hregis/develop_bug2 
Fix: syntax error
 2018-03-02 17:45:31 +01:00
Laurent Destailleur
5d74d01f61
Merge pull request #8238 from guillaume-uH57J9/patch-1 
install, don't use innodb engine for pgsql to fix #8237
 2018-03-02 17:45:12 +01:00
florian HENRY
3490d3779b Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-02 17:31:39 +01:00
florian HENRY
473c16ede5 fix pgSQL install 2018-03-02 17:30:46 +01:00
Laurent Destailleur
b87db9d32d Fix missing ; 2018-03-02 16:38:56 +01:00
Laurent Destailleur
e073fa15f7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-02 14:00:27 +01:00
Laurent Destailleur
8d11f1efa1 FIX Payment mode not correctly set in donation and document 2018-03-02 12:32:49 +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
Regis Houssin
ef60d095c0 Fix: syntax error 2018-02-25 19:55:10 +01:00
guillaume-uH57J9
d8a0cb7387
install, don't use innodb engine for pgsql 2018-02-25 19:43:53 +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