Commit Graph

46275 Commits

Author SHA1 Message Date
Laurent Destailleur
4b8fa00edb Merge pull request #2422 from guedel/sqlite3-dev
Sqlite3 dev
2015-03-11 02:54:15 +01:00
Laurent Destailleur
52e9ae5fe4 Merge pull request #2442 from delcroip/patch-2
FIX: jdate returning -62169955200 on x64 machine
2015-03-11 02:35:36 +01:00
Laurent Destailleur
e8732df747 Merge pull request #2441 from aspangaro/develop-ReviewER
FIXED: Review Expense Report
2015-03-11 02:14:13 +01:00
Laurent Destailleur
5748ea8f35 Merge pull request #2447 from TomasVotruba/patch-1
travis: PHP 7.0 nightly added
2015-03-11 02:12:58 +01:00
Laurent Destailleur
c271257452 Prepare extrafield for option by default into lists 2015-03-10 22:27:16 +01:00
Laurent Destailleur
548e720ca2 Uniformize code 2015-03-10 19:31:04 +01:00
Laurent Destailleur
b4a8f19696 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/extrafields.class.php
2015-03-10 18:37:13 +01:00
Laurent Destailleur
364b185442 Fix sql syntax 2015-03-10 18:33:14 +01:00
Laurent Destailleur
209f8946d0 All files must be lowercase 2015-03-10 14:17:58 +01:00
Laurent Destailleur
b564b754fc Doxygen 2015-03-10 14:09:29 +01:00
Laurent Destailleur
9a3e5d7fc5 Fix code unreachable 2015-03-10 13:58:26 +01:00
Laurent Destailleur
12be50d4ba Doxygen 2015-03-10 13:50:05 +01:00
Laurent Destailleur
51b67704ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-10 13:46:44 +01:00
Laurent Destailleur
194260fc5b NEW: Add search box for supplier order search. 2015-03-10 13:25:25 +01:00
Laurent Destailleur
35dfaf4dd1 Natural search on numeric works also with several space after operator 2015-03-10 10:14:24 +01:00
Laurent Destailleur
2ea3eb3505 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-10 10:12:08 +01:00
Laurent Destailleur
dc30092290 Add column to store salary ref when doing payment. 2015-03-10 10:11:51 +01:00
Tomáš Votruba
a065b8a9b4 travis: PHP 7.0 nightly added 2015-03-10 09:57:40 +01:00
Laurent Destailleur
90abe5cdf9 NEW: Add current salary on list of payment 2015-03-10 09:29:24 +01:00
Laurent Destailleur
94acbeaa22 Prepare perms on extrafields 2015-03-09 21:40:24 +01:00
Laurent Destailleur
84695845bb Some fixes into translation and permissions 2015-03-09 21:20:56 +01:00
Laurent Destailleur
88a29b7c9c Add an advance permission to check/uncheck reception 2015-03-09 20:26:56 +01:00
Laurent Destailleur
bd81dec1a3 Fix missing translation 2015-03-09 19:28:38 +01:00
Laurent Destailleur
bd6f13e6ed Can export extra fields of lines. 2015-03-09 19:13:19 +01:00
delcroix Patrick
e6984bae9d FIX: jdate returning -62169955200 on x64 machine
on x64 machine jdate return -62169955200 instead of 0 when the input is 00-00-00 00:00:00 or equivalent
same issue for mktime https://bugs.php.net/bug.php?id=53662
2015-03-08 12:37:07 +01:00
aspangaro
69dc3cdd61 Correct fk_statut & work en list 2015-03-08 08:21:49 +01:00
aspangaro
f3258d59c6 Uniformize status & add price() 2015-03-08 07:21:07 +01:00
aspangaro
80ad1be820 Merge remote-tracking branch 'Upstream/develop' into develop-patch21 2015-03-08 06:40:31 +01:00
Laurent Destailleur
3894a48ffd Fix: bad CSS 2015-03-08 02:37:25 +01:00
Laurent Destailleur
7c08f33fe1 Missing style buttonRefused 2015-03-08 02:26:41 +01:00
Laurent Destailleur
3e48456359 Fix when no price defined, we must how nothing instead of 0 2015-03-08 02:13:47 +01:00
Laurent Destailleur
56b5bfd25b NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
2015-03-08 02:08:26 +01:00
Laurent Destailleur
dd13e477b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-07 19:07:21 +01:00
Laurent Destailleur
6db3f1b30e Add mdule askpricesupplier into MAIN__MODULES_FOR_EXTERNAL 2015-03-07 19:06:56 +01:00
aspangaro
26b1f69025 Add traduction on type label 2015-03-07 15:47:08 +01:00
aspangaro
55db57d10c Path 2015-03-07 15:41:30 +01:00
aspangaro
2c738df197 Add GPLV3 & Copyright 2015-03-07 15:34:58 +01:00
aspangaro
1baf71874c Sql & $_SERVER["PHP_SELF"] 2015-03-07 15:31:23 +01:00
aspangaro
f780e908f4 Add index.html 2015-03-07 15:14:51 +01:00
aspangaro
402e0c8ad5 Add condition to access on dictionary c_type_fees when the module is enabled 2015-03-07 15:06:45 +01:00
aspangaro
df305bd316 Deactivate conflict with Mod Deplacement - Need to access on old data 2015-03-07 15:01:30 +01:00
Laurent Destailleur
fc0be43f5f Fix: beautify search box 2015-03-06 22:40:41 +01:00
Laurent Destailleur
c80007c680 Fix: we must use stockreal of stockvirtual when we are speaking about
stock ('stock' alone is not accurate enough)
2015-03-06 21:57:58 +01:00
Laurent Destailleur
9e4e9a5411 NEW: Can search on customer order amount into customer order list. 2015-03-06 20:59:18 +01:00
Laurent Destailleur
dd3f569ede NEW: Enhance the natural_search function so we can use it to search
numeric fields with criteria with operator <>= inside (< 100, >= 1000)
2015-03-06 20:34:00 +01:00
Laurent Destailleur
a1567778ab Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/commande/card.php
2015-03-06 18:51:55 +01:00
Laurent Destailleur
39192163c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-06 16:22:23 +01:00
Laurent Destailleur
e55a983c03 Fix td balance 2015-03-06 16:13:09 +01:00
Laurent Destailleur
a169b3348e Fix show alays date fields for contract module.
Fix select of product were lost.
2015-03-06 14:36:22 +01:00
Laurent Destailleur
77dd07c846 Fix thumbs generation 2015-03-06 13:12:33 +01:00