lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,233 Commits 43 Branches 150 Tags 886 MiB
35dfaf4dd1
Commit Graph

46233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
9285897759 Fix: Load priceparser only if required. 2015-02-01 15:08:56 +01:00
Marcos García de La Fuente
0c63644038 Fix: [ bug #1819 ] SQL error when searching for an invoice payment 2015-02-01 13:26:30 +01:00
Marcos García de La Fuente
ef35483494 Fix: [ bug #1819 ] SQL error when searching for an invoice payment 2015-02-01 12:58:54 +01:00
Laurent Destailleur
e4c5aa30be Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-01 01:44:01 +01:00
Laurent Destailleur
a43fcdbb14 Missing entries 2015-02-01 01:43:36 +01:00
Laurent Destailleur
968b2b433b Better position for username 2015-02-01 01:43:19 +01:00
Laurent Destailleur
52222ecdfe Avoid tooltip into tooltip 2015-02-01 01:28:15 +01:00
Laurent Destailleur
1e38227c2d Reduce number of new to save memory usage. 
Fight table to replace with div
 2015-02-01 00:54:26 +01:00
Laurent Destailleur
34cbcad9da Reduce number of new to save memory usage. 
Fight table to replace with div
 2015-02-01 00:40:42 +01:00
Laurent Destailleur
7501e09738 Fix: Crazy change 2015-01-31 22:29:31 +01:00
Laurent Destailleur
6b27d8d44c Merge pull request #2298 from ndrosis/patch-16 
Correct view link
 2015-01-31 20:25:11 +01:00
Laurent Destailleur
edcf39cd58 Merge pull request #2300 from aschio/develop 
NEW: search filter fields in list project page
 2015-01-31 20:24:48 +01:00
Laurent Destailleur
d1957ef8d9 Merge pull request #2299 from FHenry/3.7 
Fix contract if only service modules is enabled
 2015-01-31 20:20:49 +01:00
Laurent Destailleur
324ded162d Merge pull request #2297 from ndrosis/patch-15 
translate UpdateServerOffline live last version
 2015-01-31 20:20:18 +01:00
Laurent Destailleur
f52769b586 Merge pull request #2296 from frederic34/patch-5 
Speed up listing with Is Order Shippable icon
 2015-01-31 20:19:57 +01:00
Laurent Destailleur
7721f4928d Merge pull request #2295 from grandpaul/fix_webservice_product_price 
Fix: webservices productorservice not updating the price.
 2015-01-31 20:18:08 +01:00
Laurent Destailleur
3ec5b46864 Merge pull request #2294 from altatof/fix_fournprice_visibility 
FIX: always show fournprice select
 2015-01-31 19:47:46 +01:00
Laurent Destailleur
ece70dbd2c Merge pull request #2293 from frederic34/patch-4 
Error message is ErrorCounterMustHaveMoreThan3Digits
 2015-01-31 19:44:09 +01:00
Laurent Destailleur
c19ff003ea Merge pull request #2292 from FHenry/develop_contract_line_extrafileds 
NEW: contract lines extrafileds
 2015-01-31 19:43:37 +01:00
Laurent Destailleur
6976aec04b Merge pull request #2289 from accett/patch-2 
Currency symbol in Mexico
 2015-01-31 19:40:57 +01:00
Laurent Destailleur
0253f952d4 Merge pull request #2288 from accett/patch-1 
Add MXN
 2015-01-31 19:39:19 +01:00
Laurent Destailleur
963b9e8583 Merge remote-tracking branch 'origin/3.7' into develop 2015-01-31 19:37:25 +01:00
Laurent Destailleur
9188be57ce Select2 component creates problem of sizing with jmobile. 2015-01-31 19:25:26 +01:00
Laurent Destailleur
2788a352cf Missing lang loading 2015-01-31 19:00:00 +01:00
Laurent Destailleur
21f72c7594 Fix regression 2015-01-31 17:10:19 +01:00
Laurent Destailleur
13019f1f33 Clean code introduced by last PR. 2015-01-31 17:02:36 +01:00
Laurent Destailleur
87b75126aa Fix missing set into specimen 2015-01-31 16:52:34 +01:00
Laurent Destailleur
d32f52cc50 Fix date of delivery, and avoid duplicate tracking number. 2015-01-31 16:23:23 +01:00
Laurent Destailleur
1e72d49858 Merge pull request #2286 from accett/patch-1 
New: Introduce num to text function and use sign before amout for mexico currency
 2015-01-31 15:55:16 +01:00
Frédéric FRANCE
8d45d3cd59 Update 3.7.0-3.8.0.sql 2015-01-31 15:51:55 +01:00
Laurent Destailleur
a84dd26352 Merge branch 'frederic34-tooltip' into develop 2015-01-31 15:42:15 +01:00
Laurent Destailleur
d66d4f53a5 Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into 
frederic34-tooltip

Conflicts:
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/product/index.php
 2015-01-31 15:41:33 +01:00
Laurent Destailleur
56c00ae9e2 Merge branch 'IonAgorria-dinamic-prices-product' into develop 2015-01-31 14:53:48 +01:00
Laurent Destailleur
1c7feb67ea Merge branch 'dinamic-prices-product' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/fournisseurs.php
 2015-01-31 14:53:14 +01:00
Laurent Destailleur
0aab43c728 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-01-31 14:30:11 +01:00
Laurent Destailleur
2af504c020 Merge branch 'marcosgdf-task-1793' into develop 2015-01-31 14:29:56 +01:00
Laurent Destailleur
770ddb6b0f Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-task-1793

Conflicts:
	ChangeLog
	htdocs/margin/lib/margins.lib.php
 2015-01-31 14:29:15 +01:00
Laurent Destailleur
f270371716 Merge pull request #2281 from frederic34/patch-3 
Update README.md
 2015-01-31 14:27:02 +01:00
Laurent Destailleur
2581592441 Merge pull request #2287 from atm-maxime/3.6 
FIXED Import module was not working with multi-company and importing eve...
 2015-01-31 14:26:28 +01:00
Florian HENRY
1eb73d0e49 fetch optional extrafeild lines on propal fetch 2015-01-31 13:52:23 +01:00
Florian HENRY
d39439437e Add fetch optionnals extrafield on contract lines 2015-01-31 13:50:18 +01:00
Laurent Destailleur
ce8ad39a8e Remove test code and restore prod code. 2015-01-31 13:00:51 +01:00
Laurent Destailleur
720caf8e31 Missing XPF currency 2015-01-31 12:19:06 +01:00
frederic34
c1943f989b Tooltip 2015-01-31 10:58:03 +01:00
frederic34
6a1865adb6 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/fourn/commande/list.php
 2015-01-31 09:58:41 +01:00
Laurent Destailleur
d0cc56d616 Showing price without tax also. 2015-01-31 01:12:05 +01:00
Laurent Destailleur
74dafbe034 Fix missing class 2015-01-31 00:45:55 +01:00
Laurent Destailleur
03cc1bd039 Fixed bad sql error 2015-01-31 00:27:35 +01:00
Laurent Destailleur
a35bd9a3e4 Fixed bad sql request 2015-01-31 00:27:11 +01:00
Laurent Destailleur
2684b327e5 Fixed bad sql error 2015-01-31 00:23:10 +01:00