lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,947 Commits 43 Branches 150 Tags 886 MiB
4769e26d8e
Commit Graph

44947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4769e26d8e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-18 12:34:41 +01:00
Laurent Destailleur
38ba6ac75b Fixed: pgsql to make order 2014-12-18 11:48:30 +01:00
Laurent Destailleur
ef5035b349 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/liste.php
 2014-12-18 11:42:55 +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
87ec59a05c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-18 10:10:09 +01:00
Laurent Destailleur
d9aba405dd Fix: utf must be default value. 2014-12-18 10:09:47 +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
3aee8fa96b Merge pull request #2155 from grandoc/develop 
button should be within form
 2014-12-18 10:01:55 +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
Laurent Destailleur
daa98f508c Merge pull request #2156 from FHenry/3.7 
Change credential test data in WS demo
 2014-12-18 10:00:46 +01:00
Laurent Destailleur
f4e8e74449 Merge pull request #2159 from fappels/3.7 
Fix: check warehouse on product batch
 2014-12-18 10:00:29 +01:00
Francis Appels
722fdaa4eb Fix: check warehouse on product batch 
Only check warehouse on actions 'create' and 'add'
 2014-12-17 15:58:48 +01:00
Francis Appels
f7d2d0e81f Revert "Fix: check warehouse on product batch" 
This reverts commit a06c5b251e.
 2014-12-17 15:51:12 +01:00
Francis Appels
a06c5b251e Fix: check warehouse on product batch 
Only check warehouse when on actions 'create' and 'add'
 2014-12-17 15:49:51 +01:00
Laurent Destailleur
ff4f5c3fa3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-17 13:31:06 +01:00
Laurent Destailleur
52b64f3441 CSS 2014-12-17 13:27:44 +01:00
Laurent Destailleur
d98f36bd8f Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-17 01:56:52 +01:00
Laurent Destailleur
849628f020 Fix: Typo and translation 2014-12-17 01:56:36 +01:00
Laurent Destailleur
6b24a9128e Merge pull request #2150 from grandpaul/taiwanvat 
Add Taiwan VAT 5%
 2014-12-16 17:09:07 +01:00
Christophe Battarel
c9f69279c7 FIX: pagebreak on fichinter like in other documents 2014-12-16 16:21:31 +01:00
Philippe GRAND
8878ef601f form should open before table 2014-12-16 15:34:56 +01:00
Philippe GRAND
cf196c77fb one close form too much 2014-12-16 15:15:03 +01:00
Philippe GRAND
69c1de3fe1 one close form too much, an other at the wrong place 2014-12-16 15:07:23 +01:00
Philippe GRAND
e40ef3f9ce form closed at the wrong place 2014-12-16 14:49:07 +01:00
Philippe GRAND
dd6d6bc054 open form was at the wrong place 
missing close form
 2014-12-16 14:43:28 +01:00
Philippe GRAND
97b58e57df Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-12-16 13:57:16 +01:00
Laurent Destailleur
81437d8277 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-16 01:56:44 +01:00
Laurent Destailleur
174428ad31 Data init for canada vat 2014-12-16 01:55:03 +01:00
Laurent Destailleur
1850ebe33a VAT setup for canada was rong 2014-12-16 01:41:49 +01:00
Laurent Destailleur
0cd29b3343 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-15 23:24:47 +01:00
Philippe GRAND
27c0e6b4d3 balise form should close after table 2014-12-15 19:15:26 +01:00
Ying-Chun Liu (PaulLiu)
71c5f81bdf Handle updates for Taiwan VAT. 
Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
 2014-12-16 00:48:35 +08:00
Christophe Battarel
a4a1a991b8 FIX: avoid milestones in margin calculation 2014-12-15 14:13:57 +01:00
Florian HENRY
5745029942 Change credential test data in WS demo 2014-12-15 11:33:09 +01:00
Philippe GRAND
3d510ef346 closing tag twice 2014-12-15 11:19:14 +01:00
Philippe GRAND
fedd05cbcc button should be within form 2014-12-15 11:05:47 +01:00
Laurent Destailleur
bdf8189d20 Fixed: CSS 2014-12-15 10:40:39 +01:00
Laurent Destailleur
a8c6417604 Merge remote-tracking branch 'origin/3.7' into develop 2014-12-15 10:33:14 +01:00
Laurent Destailleur
d2398dd1b1 Sync from transifex 2014-12-15 10:31:40 +01:00
Laurent Destailleur
bd34f4e247 Fixed: Typo 2014-12-14 22:26:58 +01:00
Laurent Destailleur
8e6d30589d Fixed: Size too low 2014-12-14 20:51:28 +01:00
Laurent Destailleur
0b6ff8f9bc Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not 
be finished. We keep it as development status.
 2014-12-14 20:41:11 +01:00
Laurent Destailleur
c6bb5904e7 Fixed: Cancel button not correctly supported 2014-12-14 16:01:25 +01:00
Laurent Destailleur
c0afd4f174 Fixed: [ bug #1654 ] Can't display margins in product card 2014-12-14 15:44:22 +01:00
Laurent Destailleur
2245361a2e Fixed: [ bug #1732 ] Tasks ressources and time consumption are not 
deleted on project / task deletion
 2014-12-14 15:09:30 +01:00
Laurent Destailleur
8a6f7df186 Merge remote-tracking branch 'origin/3.7' into develop 2014-12-14 12:37:20 +01:00
Laurent Destailleur
fae1cd1d21 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-14 12:36:27 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00