Commit Graph

72327 Commits

Author SHA1 Message Date
Laurent Destailleur
79e3fcc109 NEW Add constant XFRAMEOPTIONS_ALLOWALL 2019-01-11 17:03:29 +01:00
Laurent Destailleur
4318c25c07 Add receptions translation files 2019-01-10 12:17:37 +01:00
Laurent Destailleur
653acf556b Fix translation Customer order into Sales order 2019-01-10 12:15:42 +01:00
Laurent Destailleur
074f163fe5 Update doc 2019-01-10 01:56:50 +01:00
Laurent Destailleur
724a2f32c3 Move module as experimental 2019-01-10 01:56:33 +01:00
Laurent Destailleur
22d4afbb62 Missing trans 2019-01-10 01:54:06 +01:00
Laurent Destailleur
48e407740d Fix tooltip 2019-01-10 01:49:49 +01:00
Laurent Destailleur
b4a6311f64 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-10 01:48:04 +01:00
Laurent Destailleur
057b606663 Fix tooltip 2019-01-09 15:03:44 +01:00
Laurent Destailleur
fbd490da15 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 13:29:47 +01:00
Laurent Destailleur
d1e062cafa FIX When changing date of payment, change also record in bank if not
conciliated yet.
2019-01-09 13:28:12 +01:00
Laurent Destailleur
003f499eb0 Add url_id into unique index of bank_url 2019-01-09 13:02:19 +01:00
Laurent Destailleur
d9999d61f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 12:27:25 +01:00
Laurent Destailleur
890abd28d5 Fix look and feel v9 2019-01-09 12:26:49 +01:00
Laurent Destailleur
09fd3fce83 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 11:41:43 +01:00
Laurent Destailleur
61e9e8d60c Fix missing link 2019-01-09 11:41:23 +01:00
Laurent Destailleur
05cdf895e8 Allow supplier code to be '0', but not empty ('') 2019-01-09 11:10:44 +01:00
Laurent Destailleur
86f0d6c26f FIX Warning on non complete setup 2019-01-09 11:02:06 +01:00
Laurent Destailleur
2ae5caa8a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-08 14:20:15 +01:00
Laurent Destailleur
d929d93376 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-08 14:19:35 +01:00
diversity-co-uk
2dc87509ff Fix Invoice PUT, remove extra parameter
The first parameter is expected to be the user.
The $id of the invoice is already contained in $this

See facture.class.php 1610:
function update(User $user, $notrigger=0)
2019-01-08 14:17:33 +01:00
Laurent Destailleur
acc665a9f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/html.form.class.php
2019-01-08 14:16:23 +01:00
Laurent Destailleur
1ee0d42408 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 14:08:22 +01:00
Laurent Destailleur
f76e62ec64
Merge pull request #10314 from diversity-co-uk/patch-1
Fix #10313 BUG: Invoice Put fails (mismatched parameters)
2019-01-08 14:07:59 +01:00
Laurent Destailleur
6ca163c68b
Merge pull request #10311 from ATM-Marc/FIX_7.0_hook_action_list
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
2019-01-08 14:06:24 +01:00
Laurent Destailleur
9a6c3ac3df FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER 2019-01-08 14:05:07 +01:00
diversity-co-uk
dab215b16d
Fix Invoice PUT, remove extra parameter
The first parameter is expected to be the user.
The $id of the invoice is already contained in $this

See facture.class.php 1610:
function update(User $user, $notrigger=0)
2019-01-08 12:31:21 +01:00
Laurent Destailleur
1e79781cba Clean parameters 2019-01-08 11:54:08 +01:00
Marc de Lima Lucio
68802c659e FIX: action list: add printFieldListSelect and printFieldListWhere hooks 2019-01-08 11:41:58 +01:00
Laurent Destailleur
5d0ff28556 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/societe/card.php
2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/admin/defaultvalues.php
	htdocs/societe/card.php
2019-01-08 01:53:00 +01:00
Laurent Destailleur
9d8b084115 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	ChangeLog
	htdocs/core/actions_sendmails.inc.php
	htdocs/filefunc.inc.php
2019-01-08 01:48:54 +01:00
Laurent Destailleur
8e3df45cbf Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/holiday/define_holiday.php
2019-01-08 01:46:03 +01:00
Laurent Destailleur
f85389ac29 Fix missing td column 2019-01-08 01:11:34 +01:00
Laurent Destailleur
41743056bf Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 01:09:21 +01:00
Laurent Destailleur
087a4400b0 FIX Default value on sales representative on third party creation 2019-01-08 01:05:42 +01:00
Laurent Destailleur
126e02798a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
1188540b41 Sync transifex 2019-01-07 19:39:41 +01:00
Laurent Destailleur
8b1455f29e FIX Cash fence 2019-01-07 19:35:20 +01:00
Laurent Destailleur
527ef8bdc8 Add nb of invoice to help cash fence 2019-01-07 19:02:38 +01:00
Laurent Destailleur
b7c73d9460 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-07 18:09:35 +01:00
Laurent Destailleur
d7406685f8 Fix transifex file 2019-01-07 18:08:38 +01:00
Laurent Destailleur
1403ac3cc1 Trans 2019-01-07 18:07:56 +01:00
Laurent Destailleur
1306918eb0 FIX #10299 2019-01-07 16:03:55 +01:00
Laurent Destailleur
ca2477a250
Merge pull request #10310 from AXeL-dev/patch-5
FIX run_sql function: support for numbers in database prefix
2019-01-07 14:10:46 +01:00
Laurent Destailleur
3d578cab28
Merge pull request #10308 from EuskalMoneta/7.0
FIX Civility not saved when creating a member.
2019-01-07 14:10:00 +01:00
Laurent Destailleur
45ceab8294
Merge pull request #10306 from mapiolca/patch-3
NEW Can add more lines on situation invoices at end of project when there is extra to add.
2019-01-07 14:09:46 +01:00
Laurent Destailleur
34413727d8 Fix 2019-01-07 13:50:59 +01:00
AXeL-dev
66e1df753e run_sql function: support for numbers in database prefix 2019-01-07 09:33:24 +01:00
Xebax
fbb1b344d1 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-06 13:44:13 +01:00