Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,690 Commits 36 Branches 189 Tags
05a7ab158b51a05dbb38ac7b02abf0d2c1df9891
Commit Graph

7572 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
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
35dfaf4dd1 Natural search on numeric works also with several space after operator 2015-03-10 10:14: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
Florian HENRY
15dfd7c08d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-03-09 10:52:09 +01:00
Estephe L.
9d320e4268 Fix Anchor link for quick access when editing. 
This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...
 2015-03-08 23:29:09 +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
80ad1be820 Merge remote-tracking branch 'Upstream/develop' into develop-patch21 2015-03-08 06:40:31 +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
6db3f1b30e Add mdule askpricesupplier into MAIN__MODULES_FOR_EXTERNAL 2015-03-07 19:06:56 +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
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
a169b3348e Fix show alays date fields for contract module. 
Fix select of product were lost.
 2015-03-06 14:36:22 +01:00
Florian HENRY
0d801be6a1 NEW: (Dev) DolGraph allow extended class to override $_stringtoshow 2015-03-06 06:12:47 +01:00
Scrutinizer Auto-Fixer
27e99793a3 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-06 02:10:01 +00:00
Laurent Destailleur
e67c328cef Merge pull request #2429 from defrance69/patch-50 
Update modFacture.class.php
 2015-03-06 02:05:00 +01:00
Laurent Destailleur
049174b76f Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/ 2015-03-06 01:53:02 +01:00
Laurent Destailleur
1660c1c05b Fix bug introduced with var_dump 2015-03-06 01:30:46 +01:00
Laurent Destailleur
97f36825df Work on new timesheet page 2015-03-05 21:47:50 +01:00
aspangaro
11704e0807 Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-05 20:24:53 +01:00
Guillaume de Lestanville
dd2594692e Updating compatibility with Sqlite3 
- Replace USING syntax by IN SELECT syntax
- Fix error on database creation
- Removing test on username parameter when installing.
 2015-03-05 17:35:37 +01:00
Laurent Destailleur
d7ab3f112c NEW: Show difference between timespent by everybody and time spent by 
user making timesheet into timesheet pages.
NEW: Can enter start hours of task when creating timesheet
 2015-03-05 13:48:57 +01:00
Laurent Destailleur
d119397129 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2015-03-05 11:38:16 +01:00
Laurent Destailleur
e431e24889 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-05 11:14:01 +01:00
Laurent Destailleur
c36f92396b Add navigation into the new timesheet week page. 
Fix bad merge
 2015-03-05 11:13:44 +01:00
guillaume
0ef46b06f4 Sqlite3-PDO restoration 
FR:
- Restauration de la version PDO dans sqlite.class.php et désactivation.
- Ajout de la classe de base de données Sqlite3 dans sqlite3.class.php

EN:
- revert of the PDO version of sqlite.class.php and deactivation.
- add database class Sqlite3 into sqlite3.class.php.
 2015-03-05 10:52:37 +01:00
BENKE Charles
703a6c1b54 Update modFacture.class.php 
add fk_bank on bill export, this fields is needed to link with external accounting
 2015-03-05 00:38:54 +01:00
Laurent Destailleur
ec4c1a493f Merge pull request #2424 from FHenry/develop 
NEW : Better extrafeild management on proposal and contract line NEW : Add company information into category contact export
 2015-03-04 23:14:05 +01:00
Laurent Destailleur
f0f0e7bfbb Merge pull request #2415 from aspangaro/develop-patch16 
NEW: Add bank account owner in invoice/proposal/orders footer
 2015-03-04 23:07:46 +01:00
Laurent Destailleur
7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 
atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 23:03:29 +01:00
Laurent Destailleur
40adbe5a72 Merge pull request #2420 from aspangaro/develop-patch17 
NEW: [T1848] Merge bank card & account card
 2015-03-04 21:09:28 +01:00
Laurent Destailleur
09035c1fee Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr 
into develop

Conflicts:
	htdocs/includes/tcpdi/fpdf_tpl.php
	htdocs/projet/card.php
 2015-03-04 20:52:54 +01:00
fmarcet
1a02f6aa80 Fix: Masks works with thirdparty type 2015-03-04 18:18:55 +01:00