Commit Graph

9302 Commits

Author SHA1 Message Date
Marcos García de La Fuente
094538c07b Implemented constants in Commande, Facture and Propal 2015-03-15 11:48:57 +01:00
BENKE Charles
8f0e514f83 Update pdf_paiement.class.php
Add bank account on detail line (usefull when you have many bank account)
Add society name in the header (usefull when you nanage many society)
2015-03-15 10:49:16 +01:00
Ion Agorria
2c80b39937 Configuration page of dinamic prices and price global variables editor 2015-03-14 16:51:38 +01:00
Ion Agorria
5f9b1fa029 Changes for applying new paths 2015-03-14 16:50:02 +01:00
Laurent Destailleur
10bbf463e7 Several bug fixes from scrutinizer 2015-03-14 14:55:41 +01:00
Laurent Destailleur
c4ff66c5d7 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-03-14 13:46:18 +01:00
Laurent Destailleur
89b22be063 FIXED: Allowed 0 to be used as an account mask. Required by CEGID. 2015-03-14 13:44:26 +01:00
Laurent Destailleur
ca34575df4 FIXED: Allowed 0 to be used as an account mask. Required by CEGID. 2015-03-14 13:42:00 +01:00
BENKE Charles
9e62013bca Update admin_extrafields_edit.tpl.php
add new type of extrafields : link
2015-03-14 12:44:26 +01:00
BENKE Charles
4783db82ac Update admin_extrafields_add.tpl.php
new type of extrafield : link
2015-03-14 12:42:52 +01:00
Laurent Destailleur
5670e92842 Position of field into pdf baleine 2015-03-14 12:35:03 +01:00
BENKE Charles
0aa2360691 Update extrafields.class.php
add new extrafields type 'link'
2015-03-14 12:31:22 +01:00
BENKE Charles
df9f822a70 Update commonobject.class.php
new extafields type
2015-03-14 12:25:17 +01:00
BENKE Charles
41a05bc4ba Update actions_extrafields.inc.php
add new type of extrafields "link" : linked to dolibarr element
2015-03-14 12:04:00 +01:00
Laurent Destailleur
d056abc4e1 No need to have this protected. Property can be read with method show()
and this method can be override.
2015-03-13 21:45:52 +01:00
Laurent Destailleur
ba2c0a2651 Clean code of hooks.
Extrafield index on fk_object must be unique.
2015-03-13 20:27:54 +01:00
Laurent Destailleur
bc3f9bf800 Fix: the visible version was not enough to know version of dolibarr. We
also need the MAIN_FEATURES_LEVEL.
2015-03-13 18:11:31 +01:00
Laurent Destailleur
687e3d250b Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	dev/fixdosfiles.sh
	htdocs/core/tpl/objectline_edit.tpl.php
2015-03-13 17:46:31 +01:00
Laurent Destailleur
a452823e1e Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility
with 3.6
2015-03-13 15:20:08 +01:00
Laurent Destailleur
895b2c6e9c Fix bad merge 2015-03-13 14:37:27 +01:00
Maxime Kohlhaas
60022ab80d NEW : autofocus on product selection dropdown list or search field 2015-03-12 17:25:57 +01:00
Laurent Destailleur
e8e2f65ae5 Debug virtual product interface 2015-03-11 14:55:45 +01:00
Laurent Destailleur
958667ada0 Fix phpcs 2015-03-11 12:33:34 +01:00
aspangaro
3897e65425 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-11 05:28:59 +01:00
Laurent Destailleur
e2e95b5f8c phpcs 2015-03-11 03:58:57 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
2015-03-11 03:29:52 +01:00
Laurent Destailleur
ec322e2e29 Revert was not complete 2015-03-11 03:03:17 +01:00
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