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

44672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Christophe Battarel
c9f69279c7 FIX: pagebreak on fichinter like in other documents 2014-12-16 16:21:31 +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
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
Laurent Destailleur
bdf8189d20 Fixed: CSS 2014-12-15 10:40:39 +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
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
da3bc3868d Fixed: Duplicated lang key 2014-12-14 11:46:21 +01:00
Juanjo Menent
3ee2ced22a Trad: Update es_ES from transifex 2014-12-13 01:28:23 +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
627e344c78 Documentation of external link. 2014-12-11 14:43:14 +01:00
Laurent Destailleur
c994fbe44d Fixed: Bad style 2014-12-11 14:31:47 +01:00
Laurent Destailleur
03cfff66ea Fixed: no form into table 2014-12-11 14:26:34 +01:00
Laurent Destailleur
036914756b Fixed: option CONTRACT_SUPPORT_PRODUCTS not correctly supported 2014-12-11 14:15:40 +01:00
Laurent Destailleur
c0473f0246 Fixed: when transvers_mode is on, a user is not linked to a dedicated 
environment (always entity 1), so we should not show info not reliable
with this mode.
 2014-12-11 13:13:11 +01:00
Laurent Destailleur
a4e0de0d8a Fixed: Contract must use serpis if no config set 
Fixed: Missing fetch_thirdparty.
 2014-12-11 13:12:05 +01:00
Laurent Destailleur
67cf3cb99b Fixed: BIC/SWIFT and IBAN must be at same level 2014-12-11 10:13:44 +01:00
Laurent Destailleur
b681885542 Fixed: Bad url link 2014-12-10 21:14:59 +01:00
Laurent Destailleur
99e5715f28 Fixed: Length too small to see fullname. 2014-12-10 20:09:48 +01:00
Laurent Destailleur
cd6c72b142 Fixed: Update of time consumed 2014-12-10 20:03:39 +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
Laurent Destailleur
7834a9b099 Add hidden constant to solve bug of too low size to see products label. 2014-12-10 00:51:57 +01:00
Laurent Destailleur
9be99b2987 Fixed: We must use PMP of product. Not warehouse. 2014-12-09 14:27:02 +01:00
Laurent Destailleur
6a70af2b67 Fixed: bug into produc batch management 2014-12-09 14:03:10 +01:00
Laurent Destailleur
63f2bfed24 Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00
aspangaro
81dc1415de Untranslatable token in activity box 2014-12-09 05:04:39 +01:00