lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,768 Commits 43 Branches 150 Tags 886 MiB
f79aeeeb0b
Commit Graph

50768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f79aeeeb0b Merge pull request #4068 from aspangaro/develop-accountancy 
Fix: typo on finance journal
 2015-11-25 23:33:29 +01:00
Laurent Destailleur
8746ee1310 Merge pull request #4067 from aspangaro/develop-donation 
NEW: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
 2015-11-25 23:33:13 +01:00
Laurent Destailleur
9d10533f3d Merge pull request #4066 from aspangaro/develop-hrm 
Fix: Auguria Menu & wrong table in dictionary HRM
 2015-11-25 23:32:36 +01:00
Laurent Destailleur
66a1becbf9 Merge pull request #4065 from frederic34/patch-5 
Typo
 2015-11-25 23:21:39 +01:00
Laurent Destailleur
2d8c2221d8 NEW Provide an easier way to understand if an order can be shipped. 2015-11-25 23:20:41 +01:00
Laurent Destailleur
28c77cbb49 Merge pull request #3994 from frederic34/patch-3 
Not shippable if quantity in all order are greater than in stock
 2015-11-25 22:26:15 +01:00
Laurent Destailleur
1d9e9ccaba NEW Add filter on status on shipments 2015-11-25 17:34:26 +01:00
Laurent Destailleur
cf98c7a6f5 Police plus grande 2015-11-25 17:11:08 +01:00
Laurent Destailleur
2593022684 Fix bad css 2015-11-25 16:45:25 +01:00
Laurent Destailleur
5568ff1c54 Fix bad picto on export 2015-11-25 16:41:40 +01:00
Laurent Destailleur
a1824955f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-23 12:21:02 +01:00
Laurent Destailleur
12358c9721 FIX The import help was not visible on calculated fields 2015-11-23 12:20:43 +01:00
Laurent Destailleur
61b46352b7 Dash line was not visible. 2015-11-23 09:36:34 +01:00
aspangaro
0899e7392b Fix: typo on finance journal 2015-11-22 22:11:22 +01:00
aspangaro
71189248d9 Correct description 2015-11-22 21:35:19 +01:00
aspangaro
5bed70b04e New: Donation complete cerfa 11580*03 Fr - Thanks Benoit21 2015-11-22 21:31:05 +01:00
aspangaro
f9e82721d7 Fix: Auguria Menu & wrong table in dictionary HRM 2015-11-22 20:13:48 +01:00
Frédéric FRANCE
3d05b53a62 Typo 2015-11-22 19:08:38 +01:00
Laurent Destailleur
ffeae34f51 Update doc 2015-11-22 18:41:35 +01:00
Laurent Destailleur
0c958521ac Fix cleaning of lines was not working 2015-11-22 17:46:25 +01:00
Laurent Destailleur
73bcc3bfe3 The temp dir for cache used by rester is correctly managed: No temp or 
data files must be stored outside of documents directory.
 2015-11-22 17:39:13 +01:00
Laurent Destailleur
296e04022f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-22 17:19:45 +01:00
Laurent Destailleur
99fa751edc Test lib is available 2015-11-22 17:19:20 +01:00
Laurent Destailleur
3c55479705 Restler #3544 2015-11-22 17:17:06 +01:00
Laurent Destailleur
3aa25cd2be Merge pull request #4064 from frederic34/escpos 
Add profile escpos printer
 2015-11-22 17:09:15 +01:00
Laurent Destailleur
91f1acd1f1 Merge pull request #4063 from grandoc/develop 
fix : Typo and translation
 2015-11-22 17:07:22 +01:00
Laurent Destailleur
3f87b30327 Use same way to obfuscate key than password 2015-11-22 14:21:12 +01:00
frederic34
6b4b70bdbb translations and help 2015-11-22 14:11:33 +01:00
Laurent Destailleur
a94aedb171 Minor css fix 2015-11-22 12:33:56 +01:00
Laurent Destailleur
cb3765bc92 Debug module Resource 2015-11-22 12:23:10 +01:00
Laurent Destailleur
e438d76df9 NEW Option encrypt password into databae is set to on by default on 
first install.
 2015-11-22 11:32:31 +01:00
frederic34
bfd97d5226 Add profile escpos printer 2015-11-22 11:04:27 +01:00
philippe grand
f4c8b5e7f8 missing translation 2015-11-22 10:46:17 +01:00
philippe grand
210c6c67cd better translation and missing translation 2015-11-22 10:40:04 +01:00
philippe grand
9cdf0f427e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-22 10:15:57 +01:00
Laurent Destailleur
c7447b0899 Add thirdparty of project into project summary of project home page. 
Total use a different color
 2015-11-21 20:25:28 +01:00
Laurent Destailleur
6f7a3f2c66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-21 20:00:50 +01:00
Laurent Destailleur
e3c6e4ebe5 NEW Add planned workload and declared progress on project summary list 
on project home page (data aggregated from tasks of project)
 2015-11-21 20:00:38 +01:00
philippe grand
0408e309f8 fix : Typo and translation 2015-11-21 19:13:34 +01:00
Laurent Destailleur
7b0a9fabab FIX Order last name / firstname in user list must be done according to 
option
 2015-11-21 18:26:25 +01:00
Laurent Destailleur
c8cf06c14b Merge pull request #4059 from fappels/develop_fix_defineBuyPrice 
Fix defineBuyPrice no min price is not error
 2015-11-21 17:53:59 +01:00
Laurent Destailleur
50cfd38e62 Merge pull request #4047 from grandoc/develop 
[Qual] Uniformize code
 2015-11-21 17:45:15 +01:00
philippe grand
e78794cab2 [Qual] Uniformize code 2015-11-21 17:38:09 +01:00
philippe grand
55bab28b9c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-21 17:15:56 +01:00
Laurent Destailleur
c15c0f6fbb Minor css fix 2015-11-21 15:31:27 +01:00
Laurent Destailleur
548ff26628 Focus on textarea works also when ckeditor is on 2015-11-21 13:42:01 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
 2015-11-21 12:48:41 +01:00
fappels
ecd3114683 Fix defineBuyPrice no min price is not error 
No min buy price is not error, return 0 if no buyprice set
 2015-11-21 12:35:45 +01:00
Laurent Destailleur
758b8e1f7e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/boxes/box_project.php
 2015-11-21 12:32:03 +01:00
fappels
0892724ffe Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2015-11-21 12:29:49 +01:00