Laurent Destailleur
|
2739fdcc2d
|
Merge pull request #4367 from benlo06/fr_4366
CLOSE #4366 Add hook for use custom ticket template
|
2016-01-10 11:36:29 +01:00 |
|
Laurent Destailleur
|
8653e7fa5c
|
Merge remote-tracking branch 'origin/3.9' into develop
|
2016-01-10 00:12:51 +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 |
|
Juanjo Menent
|
799546303b
|
Merge pull request #4373 from simnandez/develop
Fix: Move table interventions modify from 3.9 to 4.0
|
2016-01-09 18:20:52 +01:00 |
|
Juanjo Menent
|
9c0b6ff5a4
|
Fix: Move table interventions modify from 3.9 to 4.0
|
2016-01-09 18:08:55 +01:00 |
|
Juanjo Menent
|
c47e18b7e2
|
Merge pull request #4197 from atm-ph/new_mail_input_file_multiple
NEW hidden conf to use input file multiple from mail form
|
2016-01-09 17:57:50 +01:00 |
|
Juanjo Menent
|
66c5d7c9ce
|
Merge pull request #4150 from defrance/patch-84
Add date start and end of intervention
|
2016-01-09 17:56:39 +01:00 |
|
Juanjo Menent
|
c7ae943e57
|
Merge pull request #4311 from FHenry/develop
NEW : if nb total of lines provided in print barre_liste, display beside title
|
2016-01-09 17:52:05 +01:00 |
|
Juanjo Menent
|
8cabb87a2b
|
Merge pull request #4299 from aspangaro/develop-a12
Accountancy Add a list to select accounting account on dict
|
2016-01-09 17:47:33 +01:00 |
|
Juanjo Menent
|
7f6f30e69e
|
Merge pull request #4298 from aspangaro/develop-a11
Accountancy Add a list to select accounting account on tax admin
|
2016-01-09 17:47:03 +01:00 |
|
Juanjo Menent
|
cbf5021161
|
Merge pull request #4297 from aspangaro/develop-a10
Accountancy Add a list to select accounting account on accoutancy admin
|
2016-01-09 17:46:41 +01:00 |
|
Juanjo Menent
|
099ec2b0fb
|
Merge pull request #4296 from aspangaro/develop-a9
Accountancy Add a list to select accounting account on salaries admin
|
2016-01-09 17:46:24 +01:00 |
|
Juanjo Menent
|
56af0761ee
|
Merge pull request #4295 from aspangaro/develop-a8
Accountancy Add a list to select accounting account on donation admin
|
2016-01-09 17:46:02 +01:00 |
|
Juanjo Menent
|
095ee47724
|
Merge pull request #4268 from aspangaro/develop-a7
Accountancy Review page to init accountancy on product/service
|
2016-01-09 17:45:42 +01:00 |
|
Juanjo Menent
|
dbd427ea06
|
Merge pull request #4264 from aspangaro/develop-a6
Accountancy Add a list to select accounting account on bank account
|
2016-01-09 17:42:52 +01:00 |
|
Juanjo Menent
|
400a1f9825
|
Merge pull request #4253 from aspangaro/develop-a5
Move fiscal year from accountancy module to configuration of Dolibarr
|
2016-01-09 17:42:29 +01:00 |
|
Juanjo Menent
|
2bb2f22955
|
Merge pull request #4252 from aspangaro/develop-a4
Accountancy Add a list to select accounting account on product card
|
2016-01-09 17:41:43 +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 |
|
Benlo
|
ca3b58817f
|
CLOSE #4366 Add hook for use custom ticket template
|
2016-01-08 19:28:35 +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 |
|