Marcos García de La Fuente
2e68b51a10
Merge remote-tracking branch 'upstream/develop' into develop
2015-03-15 17:52:07 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +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
e76b6e740f
SQL additions
2015-03-14 16:52:01 +01:00
Ion Agorria
2d09d8196f
Language additions
2015-03-14 16:51:50 +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
9871aaed19
Price global variables and updaters classes
2015-03-14 16:50:46 +01:00
Ion Agorria
5f9b1fa029
Changes for applying new paths
2015-03-14 16:50:02 +01:00
Ion Agorria
fc5899174b
Relocation of expression files
2015-03-14 16:48:56 +01:00
Laurent Destailleur
c197e00090
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-14 14:57:58 +01:00
Laurent Destailleur
10bbf463e7
Several bug fixes from scrutinizer
2015-03-14 14:55:41 +01:00
Laurent Destailleur
cfdf12950b
Merge pull request #2452 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2015-03-14 14:34:06 +01:00
Scrutinizer Auto-Fixer
cbacfa3137
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-14 13:30:19 +00:00
Laurent Destailleur
c06ff8acd9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-14 14:30:09 +01:00
Laurent Destailleur
44d6bdb1c5
Doc
2015-03-14 14:27:45 +01:00
Laurent Destailleur
ecbee5d4dc
Merge pull request #2450 from defrance69/patch-52
...
New type of extrafields : link to connect dolibarr elements
2015-03-14 14:18:19 +01:00
Laurent Destailleur
c45ec24958
Merge pull request #2379 from atm-maxime/develop
...
New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order
2015-03-14 14:08:38 +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
Laurent Destailleur
306eff62ad
NEW: Show last official stable version into system - update page.
2015-03-14 13:23:36 +01:00
Laurent Destailleur
e935745727
Merge pull request #2285 from ndrosis/patch-14
...
New: Check live last version from sourceforge.net
2015-03-14 13:09:05 +01:00
Laurent Destailleur
2a09e34bdf
Uniformize etrafields visibility for thirdparties card
2015-03-14 13:05:28 +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
Laurent Destailleur
5146936708
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-03-14 12:04:18 +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
605a7dee0e
Fix: Deleting task do not return to correct page
2015-03-14 11:56:28 +01:00
Juanjo Menent
a2adeb2807
Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line
...
159
2015-03-14 10:17:41 +01:00
Juanjo Menent
851cae80a2
Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line
...
159
2015-03-14 10:16:50 +01:00
Juanjo Menent
a63b1cf4c3
Fix: Showing system error if not enough stock of product into orders
...
creation with lines
Conflicts:
htdocs/commande/class/commande.class.php
2015-03-14 09:57:28 +01:00
Juanjo Menent
4ae1106ffb
Fix: Showing system error if not enough stock of product into orders
...
creation with lines
Conflicts:
htdocs/commande/class/commande.class.php
2015-03-14 09:50:38 +01:00
Laurent Destailleur
0ef2369399
Enhance tools to make transifex sync
2015-03-14 02:37:18 +01:00
Laurent Destailleur
7a877e9cfb
Restore correct keys
2015-03-14 00:51:12 +01:00
Juanjo Menent
971f9b0c30
Fix: Migration script
2015-03-13 22:08:24 +01:00
Laurent Destailleur
a8e7d90ea3
Sync transifex
2015-03-13 22:02:53 +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
50b09fa8a9
Doxygen
2015-03-13 21:39:39 +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
51c877e32c
Hide a feature that is really not stable. So i move it as a "develop"
...
feature.
2015-03-13 18:03:21 +01:00
Laurent Destailleur
f090893807
Hide a feature that is really not stable. So i move it as a "develop"
...
feature.
2015-03-13 18:02:54 +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
f75749cc2b
Sync transifex
2015-03-13 17:43:04 +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
Laurent Destailleur
279e16a811
grey disabled
2015-03-13 14:24:32 +01:00
Laurent Destailleur
dfe1ee7e7d
Fix: count of notification emails was wrong
2015-03-13 14:11:59 +01:00
Laurent Destailleur
622d8ad9b0
Remove duplicate entry
2015-03-13 13:51:35 +01:00
Laurent Destailleur
9b4f65587f
Fix option MAIN_HTML_TITLE
2015-03-13 13:27:24 +01:00
Laurent Destailleur
59cbde042c
Generalize option MAIN_HTML_TITLE for all tabs of thirdparty.
2015-03-12 17:29:52 +01:00
Maxime Kohlhaas
ba0f19d116
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-12 17:12:34 +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
BENKE Charles
e7ed8ce95b
Update purchasesjournal.php
2015-03-11 10:23:33 +01:00
BENKE Charles
9fc83ca011
Update sellsjournal.php
2015-03-11 10:23:13 +01:00
BENKE Charles
f88646d954
Update export.class.php
2015-03-11 10:22:37 +01:00
Maxime Kohlhaas
3578ca8baa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-11 08:52:09 +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
41b09d8c70
Merge pull request #2448 from atm-maxime/3.6
...
Fix : display proposal date on proposal list
2015-03-11 02:50:26 +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
6f39270450
Merge pull request #2310 from FHenry/3.7
...
re-add index.html file
2015-03-11 02:29:29 +01:00
Laurent Destailleur
0ff2a0ad9f
Merge branch 'bug-1825-37' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1825-37
Conflicts:
htdocs/comm/action/index.php
2015-03-11 02:26:01 +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
734a7dd5c7
Merge pull request #2443 from biznext/patch-4
...
Fix Anchor link for quick access when editing.
2015-03-11 02:13:29 +01:00
Laurent Destailleur
c271257452
Prepare extrafield for option by default into lists
2015-03-10 22:27:16 +01:00
BENKE Charles
f91127c92a
Update purchasesjournal.php
2015-03-10 21:48:47 +01:00
BENKE Charles
bf86693dcb
Update sellsjournal.php
2015-03-10 21:47:39 +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
BENKE Charles
ea0964d1eb
Update export.class.php
...
add specific choice of prefix for export (usefull with many dolibarr exporting data)
2015-03-10 17:17:02 +01:00
Laurent Destailleur
154865f545
Fix return error when it is not
2015-03-10 16:37:39 +01:00
Laurent Destailleur
0df2b4cc26
Fix check parameters
2015-03-10 16:14:46 +01:00
Maxime Kohlhaas
05a2a6af00
FIX : [bug #1900 ] Unable to remove a salary with enough permissions
2015-03-10 15:53:02 +01:00
Maxime Kohlhaas
fa628bba6f
Fix SQL error when installing
2015-03-10 15:34:48 +01:00
Maxime Kohlhaas
6113a5b0f5
FIX : [bug #1883 ] missing field in SQL installation
2015-03-10 15:27:36 +01:00
Maxime Kohlhaas
6f9fb6a282
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-03-10 15:18:08 +01:00
Maxime Kohlhaas
154e1a7991
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
2015-03-10 15:14:25 +01:00
Maxime Kohlhaas
978dc8170d
Fix : display proposal date on proposal list
2015-03-10 14:56:58 +01:00
Maxime Kohlhaas
f90df57dc5
New : disallow social contribution modification if paid
2015-03-10 14:49:36 +01:00
Maxime Kohlhaas
db4bbf46fc
New : allow to edit social contribution amount
2015-03-10 14:43:13 +01:00
Laurent Destailleur
0b74ddf5c3
Doxygen
2015-03-10 14:23:40 +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
d847f9581e
Fix generation of RUM number. Show it on card to help debug.
2015-03-10 11:31:23 +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
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
Raphaël Doursenaud
f8dfa61859
FIXED #1901 : Inverted supplier order/invoice buttons in project referring objects
2015-03-09 16:20:51 +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
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
Florian HENRY
0d801be6a1
NEW: (Dev) DolGraph allow extended class to override $_stringtoshow
2015-03-06 06:12:47 +01:00
Laurent Destailleur
d4e37431e9
Merge pull request #2434 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2015-03-06 03:18:13 +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
Scrutinizer Auto-Fixer
a0762a5113
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-06 01:31:49 +00:00
Laurent Destailleur
2aefe61506
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-06 02:15:18 +01:00
Laurent Destailleur
c7c7c393ee
sql syntax errors
2015-03-06 02:14:59 +01: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
560b4541cd
Update packager.
2015-03-05 22:08:16 +01:00
Laurent Destailleur
97f36825df
Work on new timesheet page
2015-03-05 21:47:50 +01:00
aspangaro
8c6a50554e
Debug of Frederic34. Thanks !
2015-03-05 20:37:36 +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
22045603b7
Fix bad update of denormalized field
2015-03-05 13:51:29 +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
