lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
58,100 Commits 43 Branches 150 Tags 886 MiB
74e8fb9c19
Commit Graph

58100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphaël Doursenaud
b697da7399
Fix: [Payments] Properly escape variable for JS 
The company name may contain reserved characters such as a quote
which needs proper escaping to prevent upsetting the JavaScript
interpreter.
 2017-02-17 16:16:41 +01:00
Laurent Destailleur
49afc83a7f Merge pull request #6437 from defrance/patch-80 
"Preview" not translated
 2017-02-17 13:28:29 +01:00
Laurent Destailleur
1f156c1716 Merge pull request #6436 from defrance/patch-79 
on list, preview tooltip is not displayed correctly
 2017-02-17 13:27:31 +01:00
florian HENRY
4836fa8f76 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_can_send_to_multiple_email 2017-02-17 13:24:06 +01:00
Laurent Destailleur
7f21c3f3f2 Fix css email topic 2017-02-17 13:16:29 +01:00
Laurent Destailleur
87cbbadeed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 13:11:51 +01:00
Laurent Destailleur
8d03f86f45 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 13:10:46 +01:00
Laurent Destailleur
0e6c329695 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-17 13:10:03 +01:00
Laurent Destailleur
a91d57037e FIX #6433 2017-02-17 13:09:28 +01:00
Laurent Destailleur
10ccb91515 Merge pull request #6432 from defrance/patch-75 
Accounting code not display on tooltip
 2017-02-17 12:51:19 +01:00
BENKE Charlie
e4ede5aef3 "Preview" not translated 2017-02-17 12:32:06 +01:00
BENKE Charlie
b94312162e on list, preview tooltip is not displayed correctly 
it's a problem of alignment, the tooltip is cut by the left part on list (ex : comm/propal/list.php)
think we can do better
 2017-02-17 12:05:24 +01:00
Laurent Destailleur
c61c13d9fd Merge pull request #6428 from laudeco/fix/enable_module_with_dependencies 
fix the enabling of a dependency module already ON
 2017-02-17 10:47:29 +01:00
BENKE Charlie
90770a1f23 Accounting code not display on tooltip 2017-02-17 10:47:29 +01:00
Laurent Destailleur
37caae3466 Merge pull request #6427 from laudeco/fix/calendar_move_error 
allow the drag and drop of an event only for allowed users
 2017-02-17 10:46:15 +01:00
Laurent Destailleur
bde6815e5d Merge pull request #6425 from GPCsolutions/5.0-multicurrency-error 
Fix: [Multicurrency] properly display API error
 2017-02-17 10:45:45 +01:00
Laurent Destailleur
d3eff46305 Merge pull request #6423 from atm-florian/4.0 
FIX #6411
 2017-02-17 10:45:24 +01:00
Laurent Destailleur
0e5cd3c257 Merge pull request #6422 from defrance/patch-74 
contact email not display on tooltip
 2017-02-17 10:34:10 +01:00
Laurent Destailleur
45eba9f62e Merge pull request #6420 from fmarcet/4.0 
Fix: Bad code makes don't work for external modules numeration model
 2017-02-17 10:33:48 +01:00
Laurent Destailleur
c2ec6d5946 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-17 10:30:29 +01:00
Laurent Destailleur
d42d7343bc Merge pull request #6419 from aspangaro/5.0-26 
Fix : Link to loan admin isn't required, already support by page default account
 2017-02-17 10:24:19 +01:00
a-schild
cea25ecb28 Use correct numeric format for all soldes 2017-02-17 10:23:00 +01:00
a-schild
2083d88609 Use correct numeric format for all soldes 2017-02-17 10:22:56 +01:00
Laurent Destailleur
24d2e22ceb Merge pull request #6417 from a-schild/develop 
Use correct numeric format for amounts in accountancy balance
 2017-02-17 10:20:41 +01:00
Laurent Destailleur
efd2e85f12 Merge pull request #6416 from laudeco/fix/password_forgotten 
[mail; password; forgotten][#6334] - Fix mail url
 2017-02-17 10:19:40 +01:00
Laurent Destailleur
0bc73cfb3f Merge pull request #6421 from defrance/patch-73 
$usemargins not used on global
 2017-02-17 10:19:10 +01:00
Laurent Destailleur
beaa56306c Add united arab emirates to states. 2017-02-17 10:06:49 +01:00
Laurent Destailleur
498473715e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 01:48:43 +01:00
Laurent Destailleur
4c310964a9 Fix list of supplier proposals 2017-02-17 01:41:33 +01:00
Laurent Destailleur
ec962f13fa CSS enhancement 2017-02-17 00:59:00 +01:00
Laurent Destailleur
afa5ef2913 NEW Introduce fields that can be computed during export in export 
profiles.
 2017-02-17 00:19:28 +01:00
Laurent Destailleur
9778ca414a Better translation 2017-02-17 00:07:02 +01:00
Laurent Destailleur
4a8006b330 Fix style 2017-02-16 23:15:47 +01:00
Laurent Destailleur
c3d78bf1b4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/update.php
 2017-02-16 22:09:37 +01:00
De Coninck Laurent
fd6c4fd4d0 fix the enabling of a dependency module already ON 
If a depency module is already activated and we try to activate the parent, we got an error because the entry is already existing in the database.
 2017-02-16 09:26:18 +01:00
De Coninck Laurent
979a5e70bf allow the drag and drop of an event only for allowed users 
The drag and drop of the event didn't take into account the user rights.
 2017-02-16 07:51:46 +01:00
Laurent Destailleur
a1ba4aa941 NEW: No external check of version without explicit click in about page. 2017-02-16 02:27:07 +01:00
Laurent Destailleur
ad890561c4 Prepare release 5.0 2017-02-16 02:00:34 +01:00
Laurent Destailleur
1a3b9fada5 Som fixes on generator of samples 2017-02-16 01:50:02 +01:00
Laurent Destailleur
abb3c810de FIX false error message in shipment card 2017-02-16 01:39:16 +01:00
Laurent Destailleur
0d1bb5e7eb FIX If bank module on, field must be required to register payment of 
expense report.
 2017-02-15 23:22:47 +01:00
Laurent Destailleur
ea4a83838c Missing not visible paramater 2017-02-15 18:30:27 +01:00
Laurent Destailleur
3803330701 NEW Add option PROJECT_THIRDPARTY_REQUIRED 2017-02-15 18:09:45 +01:00
Raphaël Doursenaud
d9f32f7ae1
Fix: [Multicurrency] properly display API error 2017-02-15 13:20:38 +01:00
florian HENRY
a98e5b7290 fix syntax 2017-02-15 11:46:36 +01:00
florian HENRY
5ec01b3175 NEW : Can send email to multiple destinaries from mailform 2017-02-15 11:41:09 +01:00
fmarcet
c175dfe68b Fix: Bad code makes don't work for external modules numeration model 2017-02-15 09:47:18 +01:00
florian HENRY
89e6d86bf7 FIX #6411 2017-02-15 09:08:27 +01:00
BENKE Charlie
692dd0b5db contact email not display on tooltip 
field not initialised
 2017-02-15 01:22:20 +01:00
BENKE Charlie
a12a094172 $usemargins not used on global 
because it's defined on the tpl file (line 42)
 2017-02-15 01:11:25 +01:00