Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 11:15:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,788 Commits 39 Branches 191 Tags
82fa3a447bb7eca470dd2b7fb614703f3a7204e6
Commit Graph

42788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
82fa3a447b Merge branch '3.6' into translation 2014-12-25 01:18:58 +01:00
Juanjo Menent
c4a6377af5 Merge pull request #2169 from marcosgdf/bug-1736 
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 2014-12-24 14:27:06 +01:00
Marcos García de La Fuente
a90a03412a Fixed string not translated in linked objects of a project 2014-12-23 15:43:45 +01:00
Laurent Destailleur
56eddeade1 Fix merge changelog 2014-12-23 02:36:01 +01:00
Marcos García de La Fuente
46fe2c67e0 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks 2014-12-22 22:32:05 +01:00
Laurent Destailleur
321fd47ffc Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-20 15:53:06 +01:00
Laurent Destailleur
219cd0f855 Fixed: Translation 2014-12-20 15:52:50 +01:00
Laurent Destailleur
0628f76a2b Merge pull request #2162 from FHenry/3.6 
Update odt2pdf.sh
 2014-12-20 13:20:53 +01:00
Laurent Destailleur
beaec59ab6 PHPCS 2014-12-20 00:29:53 +01:00
Laurent Destailleur
11368e48fe Update codesniffer to remove travis errors. 2014-12-20 00:11:12 +01:00
Laurent Destailleur
789d588fde Update codesniffer to remove travis errors. 2014-12-19 19:10:41 +01:00
Laurent Destailleur
0bb431c4d0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-12-19 19:03:05 +01:00
Laurent Destailleur
47cab90336 Update codesniffer to remove travis errors. 2014-12-19 19:01:29 +01:00
HENRY Florian
578c4ca383 Update odt2pdf.sh 
Fix odt2pdf.sh
 2014-12-19 12:32:43 +01:00
Laurent Destailleur
3debf56c68 Update phpcs 2014-12-18 23:54:39 +01:00
Laurent Destailleur
3c24c1b11a Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-18 23:53:39 +01:00
Laurent Destailleur
b1c4d32fbf Update phpcs file 2014-12-18 23:53:17 +01:00
Laurent Destailleur
7ad1553859 Merge pull request #2160 from FHenry/3.6 
[ bug #1749 ] Undefined $mailchimp
 2014-12-18 22:35:45 +01:00
Florian HENRY
6f43206331 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-18 15:42:44 +01:00
Florian HENRY
c209d16881 [ bug #1749 ] Undefined $mailchimp 2014-12-18 15:42:28 +01:00
Laurent Destailleur
2c01a46774 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/paypal/lib/paypal.lib.php
 2014-12-18 10:13:25 +01:00
Laurent Destailleur
f5da9b5e33 Merge pull request #2149 from altatof/3.5 
FIX: dont put a mess with date and datetime extrafield value if already in right format
 2014-12-18 10:04:03 +01:00
Laurent Destailleur
6728ad3c37 Merge pull request #2148 from altatof/fixhook 
FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
 2014-12-18 10:03:32 +01:00
Laurent Destailleur
4887f51174 Merge pull request #2158 from altatof/fix_fichinter_pdf_pagebreak 
FIX: pagebreak on fichinter like in other documents
 2014-12-18 10:02:25 +01:00
Laurent Destailleur
615456382d Merge pull request #2157 from altatof/fix_margin_jalon 
FIX: avoid milestones in margin calculation
 2014-12-18 10:01:11 +01:00
Christophe Battarel
c9f69279c7 FIX: pagebreak on fichinter like in other documents 2014-12-16 16:21:31 +01:00
Christophe Battarel
a4a1a991b8 FIX: avoid milestones in margin calculation 2014-12-15 14:13:57 +01:00
Christophe Battarel
27b47a4f48 FIX: dont put a mess with date and datetime extrafield value if already 
in right format (the bug was in propale/order/invoice extrafields,
mainly visible with 2 datetime extrafields)
 2014-12-12 14:31:36 +01:00
Christophe Battarel
a1bba472a0 FIX: hook insertExtraFields must return a returnvalue (0,1,-1) 2014-12-12 11:57:20 +01:00
Laurent Destailleur
fbb25eae11 Merge pull request #2138 from aspangaro/3.5-patch1 
Correct in activity box
 2014-12-10 11:31:48 +01:00
aspangaro
81dc1415de Untranslatable token in activity box 2014-12-09 05:04:39 +01:00
aspangaro
666e66e78f Correct link in activity box 2014-12-09 05:04:12 +01:00
Laurent Destailleur
b11ac14cf0 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-12-09 01:13:34 +01:00
Laurent Destailleur
1461072801 Fix: Paypal link were broken dur to SSL v3 closed. 2014-12-09 01:12:52 +01:00
Laurent Destailleur
ae3c83b7dc Merge pull request #2133 from aspangaro/3.6-patch2 
#1725 Missing table cells in services list header
 2014-12-08 00:06:54 +01:00
Laurent Destailleur
293726c5e8 Merge pull request #2135 from FHenry/3.5 
3.5
 2014-12-07 23:58:30 +01:00
Florian HENRY
bd8b393d8a Fix [ bug #1740 ] Clone project make task date crazy 2014-12-05 21:25:43 +01:00
Florian HENRY
aaf2cca45f Fix bug n sellist extrafield filtered 2014-12-05 21:25:43 +01:00
Laurent Destailleur
a07852c699 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2014-12-04 15:22:08 +01:00
Laurent Destailleur
9e1b0d1abc Prepare 3.5.6 3.5.6 2014-12-04 15:09:47 +01:00
Laurent Destailleur
e21d6b0954 Merge pull request #2131 from aspangaro/3.6-patch 
Untranslatable token Calendar in datepicker
 2014-12-03 12:16:55 +01:00
Laurent Destailleur
4ff78c09fc Merge pull request #2132 from aspangaro/3.6-patch1 
Typo
 2014-12-03 12:16:20 +01:00
aspangaro
477aeecdac #1725 Missing table cells in services list header 2014-12-02 22:30:40 +01:00
aspangaro
5a05d4a4b8 Untranslatable token Calendar in datepicker 2014-12-02 20:59:00 +01:00
aspangaro
f6ab7ca0c9 Typo 2014-12-02 20:42:47 +01:00
Laurent Destailleur
a81c483061 Revert "Update objectline_create.tpl.php" 
This reverts commit fdac53bfca.
 2014-11-28 02:14:25 +01:00
Laurent Destailleur
4be9730518 Merge pull request #2099 from fappels/3.6 
Fix: Show sender Country on PDF docs
 2014-11-28 00:08:41 +01:00
Francis Appels
b1a4b8e7d0 Fix: [ bug #1624 ] POS set buy price for margin 
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
 2014-11-25 21:20:13 +01:00
Francis Appels
18406fc550 Fix: Show sender Country on PDF docs 
Show sender Country on PDF docs when sender Country != receiver Country
 2014-11-25 14:26:45 +01:00
Laurent Destailleur
1dbb19e8ef Merge pull request #2058 from defrance69/patch-30 
Update objectline_create.tpl.php
 2014-11-24 10:57:14 +01:00