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

38428 Commits

Author SHA1 Message Date
Ion Agorria
48e1f4ec55 Library for evaluating math expresions 2014-11-29 06:30:26 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
 2014-11-28 02:20:01 +01:00
Laurent Destailleur
9ba5e9434d Fix: W3C a label must be used if there is an "input" field only. Also it 
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
 2014-11-28 02:05:40 +01:00
Laurent Destailleur
06894a196c Merge pull request #2112 from frederic34/patch-2 
Put form outside table
 2014-11-28 01:18:54 +01:00
Marcos García de La Fuente
1c16a2e621 Fixed [ bug #1642 ]: add a free line in contract 2014-11-28 01:15:45 +01:00
Laurent Destailleur
44b81ad29c Merge pull request #2074 from marcosgdf/bug-1642 
Fixed [ bug #1642 ]: add a free line in contract
 2014-11-28 01:14:23 +01:00
Laurent Destailleur
79c8980493 Fix: function at wrong place 2014-11-28 01:13:57 +01:00
Marcos García de La Fuente
5cc015268e Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks 2014-11-28 01:02:59 +01:00
Marcos García de La Fuente
0a0e0e068c Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module 2014-11-28 01:02:44 +01:00
Laurent Destailleur
bca0ccb4e3 Merge pull request #2088 from marcosgdf/bug-1691 
Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module
 2014-11-28 01:01:52 +01:00
Frédéric FRANCE
523afc3943 Put form outside table 2014-11-28 00:57:40 +01:00
Laurent Destailleur
806719b562 Merge pull request #2089 from marcosgdf/bug-1718 
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
 2014-11-28 00:37:56 +01:00
Laurent Destailleur
38062177d3 Doxygen 2014-11-28 00:37:46 +01:00
Laurent Destailleur
232921a506 Fixed: Add option on a not common new feature 2014-11-28 00:34:03 +01:00
Laurent Destailleur
dc1c98734e Fixed: Option specific to a module should start with module name 2014-11-28 00:21:52 +01:00
Laurent Destailleur
f9953d52f6 Merge pull request #2091 from frederic34/patch-3 
Fix 1721 Missing translation on proposal creation
 2014-11-28 00:16:44 +01:00
Laurent Destailleur
ae6f458a98 Merge pull request #2092 from frederic34/patch-2 
Fix Typo
 2014-11-28 00:12:11 +01:00
Laurent Destailleur
02d53aa26f Merge pull request #2093 from frederic34/patch-4 
Fix Typo
 2014-11-28 00:11:49 +01:00
Laurent Destailleur
b21171303a Merge pull request #2094 from frederic34/patch-5 
Fix Typo
 2014-11-28 00:11:23 +01:00
Laurent Destailleur
631a98c322 Merge pull request #2095 from frederic34/patch-6 
Fix Typo
 2014-11-28 00:10:48 +01:00
Laurent Destailleur
61889d2195 Merge pull request #2096 from frederic34/patch-7 
Fix Typo
 2014-11-28 00:10:24 +01:00
Laurent Destailleur
db5fb1ad9e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-28 00:05:02 +01:00
Laurent Destailleur
6843bfcc15 Fix typo 2014-11-28 00:01:59 +01:00
Laurent Destailleur
3af6e048e5 Merge pull request #2101 from frederic34/patch-8 
Fix remove </a> not needed
 2014-11-27 23:59:05 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center 
Task 1603 - Remove <center> deprecated HTML5 tags
 2014-11-27 23:58:44 +01:00
Laurent Destailleur
f01c5d0ea3 Merge pull request #2111 from frederic34/patch-13 
Update Invoice Preview to be like order and propal preview
 2014-11-27 23:25:49 +01:00
Laurent Destailleur
f36a30f9fe Fixed: W3C. An id must be unique inside a page. 2014-11-27 23:25:29 +01:00
Frédéric FRANCE
5a97ee1f95 Rearrange Help Block in left menu 2014-11-27 23:20:13 +01:00
Laurent Destailleur
e6d200d83a Merge pull request #2104 from frederic34/patch-10 
Rearrange Help Block in left menu
 2014-11-27 23:19:18 +01:00
Frédéric FRANCE
bc58641828 Update Invoice Preview to be like order and propal preview 2014-11-27 22:07:18 +01:00
Laurent Destailleur
60e5369db2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/bookmarks/card.php
 2014-11-27 22:01:02 +01:00
Laurent Destailleur
8d33a6947b Merge pull request #2105 from frederic34/patch-11 
Fix 1733 Homepage boxes close button translation error
 2014-11-27 21:51:00 +01:00
Laurent Destailleur
d4ac3c96dd Merge pull request #2108 from frederic34/patch-14 
Update Order Preview
 2014-11-27 21:50:21 +01:00
Laurent Destailleur
6f3dde8a9b Merge pull request #2109 from frederic34/patch-15 
Update Invoice Preview
 2014-11-27 21:50:09 +01:00
Laurent Destailleur
8a8f9aaee3 Merge pull request #2106 from frederic34/patch-12 
Fix 1655 Proposal amount not computed in preview
 2014-11-27 21:49:43 +01:00
Frédéric FRANCE
6483b34d0d Update apercu.php 2014-11-27 21:03:51 +01:00
Frédéric FRANCE
f769295999 Update apercu.php 2014-11-27 21:03:01 +01:00
Frédéric FRANCE
950fad9227 Update apercu.php 2014-11-27 17:49:48 +01:00
jfefe
1b35c5e77b Missing extrafields management for order webservice 2014-11-27 12:56:10 +01:00
Frédéric FRANCE
755732ce58 Update apercu.php 2014-11-26 20:35:08 +01:00
Frédéric FRANCE
96e0ecd1a7 Update Invoice Preview 2014-11-26 20:07:47 +01:00
Frédéric FRANCE
238b139274 Update apercu.php 2014-11-26 19:52:38 +01:00
Frédéric FRANCE
2ee55a39fd Update ecm.lib.php 2014-11-26 18:35:16 +01:00
Frédéric FRANCE
2a25f990ac Fix 1660 ECM tabs help tooltips not showing 2014-11-26 18:33:03 +01:00
Frédéric FRANCE
e179e7d5a5 Fix 1655 Proposal amount not computed in preview 2014-11-26 17:24:26 +01:00
Frédéric FRANCE
90b582b1f3 Fix 1733 Homepage boxes close button translation error 
In french : Close -> Clotûrer (Close a propal)
Close2 ->Fermer (Close a window)
 2014-11-26 16:58:54 +01:00
Frédéric FRANCE
ebc0f842fc Rearrange Help Block in left menu 2014-11-26 16:48:37 +01:00
aspangaro
38d94bac33 Correct login page 2014-11-25 21:47:08 +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