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

37413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García
e727100cf0 New: Clone product/service composition 2013-06-10 00:11:25 +02:00
Marcos García
9c0fe61a21 Fix CR 2013-06-10 00:09:16 +02:00
Marcos García
0abcea745e CR Fix 
Git required me to commit these changes
 2013-06-09 15:47:03 +02:00
Marcos García
a12276f22c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-06-09 15:45:55 +02:00
Marcos García
3e0815c759 CR Fix 
Git required me to commit these changes
 2013-06-09 15:37:25 +02:00
Laurent Destailleur
89ee79f5cf New: Implement same rule for return value of all command line scripts (0 
when success, <>0 if error).
 2013-06-09 14:40:33 +02:00
Laurent Destailleur
e6155ebfd8 Fix: missing class 2013-06-09 12:56:20 +02:00
Laurent Destailleur
e1f922b37b Update changelog 2013-06-09 12:49:05 +02:00
Laurent Destailleur
7d2f904174 Fix: Option MEMBER_PAYONLINE_SENDEMAIL was not working 2013-06-09 12:47:44 +02:00
Laurent Destailleur
49d65e5ebe Fix: criteria of select 2013-06-09 03:10:31 +02:00
Laurent Destailleur
96286571e7 Merge pull request #1031 from marcosgdf/bug-933 
Fix bug #933: Ajax error
 2013-06-08 17:48:28 -07:00
Marcos García
f0454926c2 Fix bug #933: Ajax error 
Caused by commit 7e53f98
 2013-06-08 22:29:18 +02:00
Laurent Destailleur
c8a634fa08 Merge pull request #1027 from marcosgdf/develop 
CR fix
 2013-06-08 11:01:07 -07:00
Laurent Destailleur
2c14496d3c Fi: translation 2013-06-08 19:56:56 +02:00
Laurent Destailleur
9f0107a6b8 Fxi language 2013-06-08 19:21:24 +02:00
Marcos García
5069177f46 CR fix 2013-06-08 19:02:00 +02:00
Laurent Destailleur
5a77828e62 New: Add object_hour as substitution tag for opendocument generation. 2013-06-08 18:12:32 +02:00
Laurent Destailleur
5d1dfdc7c1 Upgrade tcpdf to 6.0 2013-06-08 16:29:59 +02:00
Laurent Destailleur
f65e16ae9c Fix: Add key into english to not loose them with transifex into other 
languages
 2013-06-08 16:05:01 +02:00
Laurent Destailleur
319295554d Fix: Free memory after request 2013-06-08 00:52:02 +02:00
Laurent Destailleur
9fae9da6a1 Fix: proxy was not used everywhere, timeout was not set everywhere. 2013-06-07 20:09:15 +02:00
Laurent Destailleur
c3f5e0c6ee New: Show version of client lib used by mysql drivers 2013-06-07 19:19:11 +02:00
Laurent Destailleur
0806d00b47 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-07 18:45:13 +02:00
Laurent Destailleur
0f5f6760a9 Fix: Miscellaneous fixes into cachdesk module: 
- Missing footer in cashdesk module
- Wrong field label
- Do not use limit list (Freeze when too many product)
 2013-06-07 15:58:15 +02:00
Laurent Destailleur
421c3fb35b Fix: Bad param 'zone' into printCommon 2013-06-07 13:41:32 +02:00
Laurent Destailleur
35fbc9b066 - New: Can enable tuning info from option MAIN_SHOW_TUNING_INFO. 2013-06-07 12:43:41 +02:00
Laurent Destailleur
21c6d42d82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-06 21:19:03 +02:00
Laurent Destailleur
31fe378f3b Fix: Pb of offset in numbering. Add also phpunit test to detect and test 
fix.
 2013-06-06 21:18:50 +02:00
Laurent Destailleur
368efc77e0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-06 18:56:59 +02:00
Laurent Destailleur
aaaca05711 Merge pull request #1026 from csalvador/select_company_fix 
Select company bugfix
 2013-06-06 09:56:28 -07:00
Laurent Destailleur
4654e811b2 Close taks [ task #645 ]. We keep fields, just add comment into tables 
with explanation of fields.
 2013-06-06 18:54:17 +02:00
Cédric Salvador
8ad2fad817 fixed select_thirdparty_list call in the select_company function 2013-06-06 18:31:52 +02:00
Cédric Salvador
b747b0349d merge 2013-06-06 18:31:33 +02:00
Laurent Destailleur
09526dd234 Merge pull request #1025 from grandoc/develop 
code was displayed twice
 2013-06-06 00:59:49 -07:00
Laurent Destailleur
4083d9a819 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-06 09:49:54 +02:00
Laurent Destailleur
4bc8cbc993 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-06 09:43:02 +02:00
Laurent Destailleur
bf8fd7d34f Fix: CSS 2013-06-06 09:42:39 +02:00
Grand Philippe
db6d226ffd code was displayed twice 2013-06-06 09:22:26 +02:00
Laurent Destailleur
8bad0fc97d Merge pull request #1024 from csalvador/updateline-bug 
fixed bug when editing a supplier order line
 2013-06-05 15:41:02 -07:00
Laurent Destailleur
81d6d5d51f Doc 2013-06-05 22:28:55 +02:00
Laurent Destailleur
b7f697e8c4 Remove a call of a deprecated function 2013-06-05 22:27:02 +02:00
Laurent Destailleur
8e13c4eddf Merge remote-tracking branch 'origin/3.4' into develop 2013-06-05 22:11:28 +02:00
Laurent Destailleur
56f9d8f50c Fix: missing style 2013-06-05 22:10:43 +02:00
Laurent Destailleur
7e53f98baa Qual: Uniformize code 2013-06-05 22:01:35 +02:00
Laurent Destailleur
52407f88c4 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-05 21:59:23 +02:00
Laurent Destailleur
0b481f285a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 21:56:37 +02:00
Laurent Destailleur
61d5359f23 Fix: Uniformize menu entries 2013-06-05 21:55:51 +02:00
Laurent Destailleur
e25651204c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/admin.lib.php
 2013-06-05 18:56:41 +02:00
Laurent Destailleur
07d64d472e Merge pull request #1022 from GPCsolutions/idea 
Ignore IntelliJIDEA module files
 2013-06-05 09:44:41 -07:00
Cédric Salvador
37ef86379f fixed bug when editing a supplier order line 2013-06-05 18:19:50 +02:00