Commit Graph

51549 Commits

Author SHA1 Message Date
Regis Houssin
694530bfae Fix: Gives the possibility to the module, to provide his own family info
and position of this family. (canceled $this->family)
2016-01-10 13:00:48 +01:00
Laurent Destailleur
94814e58e5 Merge pull request #4334 from olsesacl/patch-1
Fix check userlocaltax1_rate and userlocaltax2_rate
2016-01-10 11:51:26 +01:00
Laurent Destailleur
40f0d0c9f2 Merge pull request #4321 from fmarcet/3.7
FIX: Email templates not compatible with Multicompany
2016-01-10 11:49:37 +01:00
Laurent Destailleur
70ffcfea33 Merge pull request #4380 from aspangaro/3.9-p4
Fix: Donation some problems with french article
2016-01-10 11:46:12 +01:00
Laurent Destailleur
d8001a8e7a Merge pull request #4379 from aspangaro/3.9-p3
Fix: SQL error on user bank tab
2016-01-10 11:45:40 +01:00
Laurent Destailleur
ffe80a36e1 Merge pull request #4378 from aspangaro/3.9-p1
Fix: Add missing key language for propal
2016-01-10 11:43:54 +01:00
Laurent Destailleur
c22bc8a29e Merge pull request #4377 from aspangaro/3.9-p2
Fix: Wrong language file for 2 menu entries in accountancy module
2016-01-10 11:38:21 +01:00
Laurent Destailleur
aa0b002119 Fix #4354 2016-01-10 11:35:06 +01:00
Laurent Destailleur
fddd02eecc Complete fix #4354 2016-01-10 11:31:22 +01:00
aspangaro
965a96784c Fix: Donation some problems with french article 2016-01-10 07:35:00 +01:00
aspangaro
87f1e55bcb Fix: SQL error on user bank tab 2016-01-10 07:08:49 +01:00
aspangaro
af9e46d179 Fix: Wrong language file for 2 menu entries in accountancy module 2016-01-10 06:56:20 +01:00
aspangaro
e82f7761bc Merge remote-tracking branch 'Upstream/3.9' into 3.9-p1 2016-01-10 06:26:42 +01:00
Laurent Destailleur
2764fb240f Fix text color for category tags
Fix banner for category translation tab
2016-01-10 00:11:49 +01:00
aspangaro
3ff9fe3123 Fix: Add missing key language for propal 2016-01-09 08:26:08 +01:00
Laurent Destailleur
b2924885aa Fix css 2016-01-09 03:00:12 +01:00
Laurent Destailleur
a8758fa5b7 Bug war week-end: Fix a duplicate page on holiday, fix missing badge on
some documents tabs.
2016-01-09 01:54:46 +01:00
Laurent Destailleur
0d8788e552 FIX It was not possible to define if leave type need to be followed by a
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
2016-01-09 01:18:53 +01:00
Laurent Destailleur
e79750dc89 I continue bug war week-end 2016-01-09 00:44:06 +01:00
Laurent Destailleur
e5d0bc9d57 Fix permission not used 2016-01-09 00:34:15 +01:00
Laurent Destailleur
06c97b931b Fix css 2016-01-09 00:06:16 +01:00
Laurent Destailleur
37c106acff Fix search on shipment 2016-01-08 23:59:02 +01:00
Laurent Destailleur
99f3870ee6 Fix no picot if no warehouse set
Fix search on warehouse
2016-01-08 23:54:40 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
127354f0af Minor fixes 2016-01-08 22:41:30 +01:00
Laurent Destailleur
f9933aba0c Install style match application style 2016-01-08 22:23:57 +01:00
Laurent Destailleur
c9176cd6b4 Missing translation 2016-01-08 18:22:41 +01:00
Laurent Destailleur
de36db19bc Fix do not show warehouse for shipment on not predefined product 2016-01-08 18:15:53 +01:00
Laurent Destailleur
b6895c7c1f Fix: a badge css was found into an array 2016-01-08 17:23:25 +01:00
Laurent Destailleur
87c236b534 Fix when error creating invoice from predefined invoice, we must go back
to create page from same predefined invoice.
2016-01-08 16:30:43 +01:00
Laurent Destailleur
20f1455090 FIX #4314 2016-01-08 15:45:23 +01:00
Laurent Destailleur
3dafe76f5e Complete changelog 2016-01-08 14:51:20 +01:00
Laurent Destailleur
2259cf2340 Merge remote-tracking branch 'origin/3.8' into develop 2016-01-08 14:49:00 +01:00
Laurent Destailleur
8366310f0f Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/admin/agenda_extsites.php
2016-01-08 14:47:46 +01:00
Laurent Destailleur
e008922919 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/admin/agenda_extsites.php
2016-01-08 14:45:53 +01:00
Laurent Destailleur
5414cb6f12 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2016-01-08 14:43:20 +01:00
Laurent Destailleur
a26a6c2449 Fix sql injection even when code is on several lines 2016-01-08 14:43:04 +01:00
Laurent Destailleur
c2b8be9aaf Merge pull request #4355 from GPCsolutions/3.6-4291
FIX #4291 Correctly filter external calendar GETPOSTs
2016-01-08 14:23:56 +01:00
Laurent Destailleur
844e8bff83 Better fix for #4354 2016-01-08 14:22:21 +01:00
Laurent Destailleur
36df5a7325 Merge pull request #4362 from Dolibarr/revert-4354-patch-1
Revert "Debug of module leave requests "
2016-01-08 14:15:32 +01:00
Laurent Destailleur
6a058edc23 Revert "Debug of module leave requests " 2016-01-08 14:15:22 +01:00
Laurent Destailleur
cce473b2cb Merge pull request #4354 from T-B-A-I/patch-1
Debug of module leave requests
2016-01-08 14:13:08 +01:00
Laurent Destailleur
3054076f9b Merge pull request #4350 from GPCsolutions/dolibarr-export
Added git export ignores
2016-01-08 14:10:36 +01:00
Laurent Destailleur
d4aa83e7ca Merge pull request #4343 from grandoc/develop
translations
2016-01-08 14:07:05 +01:00
Laurent Destailleur
36dc8b1ce7 FIX #4341 2016-01-08 13:57:53 +01:00
Laurent Destailleur
5785744d5a Add ignore 2016-01-08 13:06:38 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late
to use them. Will be done into 4.0
2016-01-08 13:05:56 +01:00
Raphaël Doursenaud
f2178f0369 FIX #4291 Correctly filter external calendar GETPOSTs 2016-01-08 06:42:28 +01:00
TBAI
8c48785de7 Debug of module leave requests
Add text in holiday module
2016-01-07 20:10:22 +01:00
TBAI
f28ebefe93 Debug of module leave requests
Cancel leave isn't possible if it has been validated
2016-01-07 19:53:59 +01:00