Commit Graph

72480 Commits

Author SHA1 Message Date
Laurent Destailleur
1345a63c8c Update doc 2019-01-16 20:56:11 +01:00
JC Prieto
5223b1ee1a FIX: To add more pdf models in thirdparties 2019-01-16 20:23:16 +01:00
Laurent Destailleur
f8973c9a22 Fix translation Late <> Alert 2019-01-16 17:44:39 +01:00
Laurent Destailleur
d3828130ab Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
Laurent Destailleur
688311c761 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-16 16:45:38 +01:00
Laurent Destailleur
698222c769 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/adherents/subscription.php
2019-01-16 16:45:30 +01:00
Laurent Destailleur
476527e71e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-01-16 16:34:46 +01:00
Laurent Destailleur
6becdc8af4 Fix missing substitution of ID 2019-01-16 16:34:36 +01:00
Laurent Destailleur
638be67f96 Fix tooltip 2019-01-16 13:56:13 +01:00
a-schild
7e3bfd332e Fix for issue #10333
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:07:00 +01:00
a-schild
7df86cb630 Fix for issue #10333
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:06:12 +01:00
a-schild
2f5db98a5c Fix for issue #10333
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:05:22 +01:00
Laurent Destailleur
f4dd8a4e50 Update myobject_card.php 2019-01-16 12:47:44 +01:00
Bahfir Abbes
66f17ac422 simplification 2019-01-16 12:47:36 +01:00
Abbes Bahfir
6b808acfbb linl back to list if cancelled on create 2019-01-16 12:47:31 +01:00
Laurent Destailleur
346028c8d5 Merge pull request #10340 from atm-quentin/FIX_Credit_Note_Free_Line
FIX credit note can have negative value
2019-01-16 12:11:21 +01:00
atm-quentin
0d384eea00 FIX credit note can have negative value 2019-01-16 09:33:24 +01:00
Laurent Destailleur
1f87b8bb18 FIX Position of price symbol (before) for nl_NL 2019-01-16 01:54:08 +01:00
Laurent Destailleur
f51b4288da Merge pull request #10336 from hregis/8.0_bug
FIX avoid php warning
2019-01-15 17:59:09 +01:00
Laurent Destailleur
6dd905048c Merge pull request #10334 from hregis/8.0_mc
FIX problem with multicompany transverse mode
2019-01-15 17:57:45 +01:00
Laurent Destailleur
adc4422323 Update card.php 2019-01-15 17:57:30 +01:00
Laurent Destailleur
05dc40b6b9 Merge pull request #10331 from frederic34/patch-2
correct list of links
2019-01-15 17:52:05 +01:00
Regis Houssin
41a38b3a0a FIX avoid php warning
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-15 15:44:45 +01:00
Regis Houssin
7c9d85d091 FIX problem with multicompany transverse mode
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2019-01-15 12:18:04 +01:00
Laurent Destailleur
6159703116 Fix warning and date 2019-01-15 11:14:01 +01:00
Laurent Destailleur
2ec2daa18d FIX Edit blog meta post 2019-01-15 10:53:28 +01:00
ATM-Nicolas
2a7b3c7d7d FIX : Check for old picture name if the new one was not found 2019-01-14 10:48:34 +01:00
Frédéric FRANCE
cf55b54cf5 correct list of links 2019-01-14 10:02:48 +01:00
Laurent Destailleur
8c6fde72f8 Several fixes in look and feel of module survey 2019-01-13 19:36:00 +01:00
Laurent Destailleur
e0d11edb6b FIX Sql error on filter of project preview with date 2019-01-13 14:09:40 +01:00
Laurent Destailleur
1aa2b7a164 FIX SQL injection on rowid of dict.php 2019-01-10 03:26:34 +01:00
Laurent Destailleur
7ea5407ac1 Update doc 2019-01-10 01:57:47 +01:00
Laurent Destailleur
057b606663 Fix tooltip 2019-01-09 15:03:44 +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
890abd28d5 Fix look and feel v9 2019-01-09 12:26:49 +01:00
Laurent Destailleur
61e9e8d60c Fix missing link 2019-01-09 11:41:23 +01:00
Laurent Destailleur
0d9367b09d Merge pull request #10305 from tuxgasy/8.0_bill_orders
Fix #10301 mass bill orders
2019-01-08 16:50:48 +01:00
Laurent Destailleur
a1f5ede736 Update actions_massactions.inc.php 2019-01-08 16:50:27 +01:00
Laurent Destailleur
47448b77f0 Update actions_massactions.inc.php 2019-01-08 16:47:30 +01:00
TuxGasy
2c2f86736a Fix #10301 mass bill orders and replicate extrafields 2019-01-08 15:59:20 +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
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
Marc de Lima Lucio
68802c659e FIX: action list: add printFieldListSelect and printFieldListWhere hooks 2019-01-08 11:41:58 +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