Commit Graph

45041 Commits

Author SHA1 Message Date
Laurent Destailleur
7af4d91828 Merge pull request #4251 from fmarcet/3.6
FIX: Not deleting contracts on element_element table
2015-12-18 17:07:42 +01:00
Laurent Destailleur
c328860af0 Merge pull request #4250 from GPCsolutions/dolibarr-4242
FIX #4242 Allow disabling dashes in documents
2015-12-18 17:07:00 +01:00
Laurent Destailleur
452feca64a Merge pull request #4249 from GPCsolutions/3.8-4242
FIX #4242 Allow disabling dashes in documents
2015-12-18 17:06:51 +01:00
Laurent Destailleur
d0ec3f1152 Merge branch 'dolibarr-cifix' of
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-dolibarr-cifix

Conflicts:
	htdocs/product/card.php
2015-12-18 17:05:04 +01:00
Regis Houssin
70354def7c Fix: Disable "main.inc.php" hooks with ajax return 2015-12-18 13:27:51 +01:00
Laurent Destailleur
98cd4f8307 Fix message so it is more clear what the feature can do or not.
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
cla
cb96618460 Merge branch 'develop' into develop_sunimport 2015-12-18 10:49:57 +01:00
Laurent Destailleur
b10f9d4ca3 Fix: when doing an export of extrafields, we must use different table
alias for each extrafield table.
2015-12-17 20:40:33 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
philippe grand
6e45ad92fa fix some issue within setEventMessages attribut 2015-12-17 17:35:30 +01:00
philippe grand
b91031b693 fix some issue within my last commit 2015-12-17 17:20:28 +01:00
Laurent Destailleur
5f4947e3c1 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-17 17:16:37 +01:00
Laurent Destailleur
cdc408a84c Fix: button "now" was not working on date using no javascript 2015-12-17 17:16:26 +01:00
philippe grand
367d9de0b7 fix some translation 2015-12-17 17:12:28 +01:00
philippe grand
93845ffa69 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-12-17 16:58:05 +01:00
philippe grand
c9d6607b04 [Qual] Uniformize code 2015-12-17 14:14:44 +01:00
Laurent Destailleur
92343901d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-17 14:01:34 +01:00
Laurent Destailleur
ba3c8de785 Update doc comment to make things cleaner to avoid confusion between old
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
fmarcet
21f7271e51 FIX: Not deleting contrats on element_element table 2015-12-17 12:36:43 +01:00
Raphaël Doursenaud
4f9ab7da24 FIX #4242 Allow disabling dashes in documents
3.9 specific fix since document have moved
2015-12-17 10:39:55 +01:00
Raphaël Doursenaud
7e98cfd5b6 FIX #4242 Allow disabling dashes in documents
3.8 specific fix for new documents
2015-12-17 10:33:17 +01:00
Raphaël Doursenaud
02e053acc6 FIX #4242 Allow disabling dashes in documents
3.7 specific fix since document files have moved
2015-12-17 10:26:27 +01:00
Raphaël Doursenaud
e6ec797af8 FIX #4242 Allow disabling dashes in documents 2015-12-17 10:21:44 +01:00
Raphaël Doursenaud
c2642acdba Fix CI build 578 (Syntax error)
empty() only supports variables in PHP < 5.5
2015-12-17 10:03:42 +01:00
Laurent Destailleur
34f4e913d4 Merge pull request #4240 from frederic34/patch-9
Fix when PRODUIT_MULTIPRICES is set, label for each level was not visible
2015-12-16 19:58:48 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
6133298e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-16 19:27:23 +01:00
Laurent Destailleur
f87ccc97e2 Miscellaneous fixes 2015-12-16 19:26:50 +01:00
Laurent Destailleur
33ea5c83b7 Merge pull request #4238 from fappels/develop
Fix product list page offset calculation
2015-12-16 19:26:32 +01:00
Laurent Destailleur
acc4623b74 Merge pull request #4236 from defrance/patch-90
fix ErrorBadValueForParamNotAString shit one again...
2015-12-16 19:25:39 +01:00
Laurent Destailleur
609b8a8506 Merge pull request #4234 from aspangaro/develop-a3
Accountancy- Add a column in table bookkeeping to validate operations
2015-12-16 19:15:13 +01:00
Laurent Destailleur
7c1fc2fee1 Merge pull request #4233 from aspangaro/3.7-accountancy1
Fix: Accountancy Add an empty field for list of parent account - This value can be null
2015-12-16 19:14:45 +01:00
Laurent Destailleur
516e071363 Merge pull request #4232 from aspangaro/develop-remove_zero
New: Accountancy add a function to remove all zero at the right of the account
2015-12-16 19:13:43 +01:00
Laurent Destailleur
710a8bb6a9 Merge pull request #4231 from mrsof/patch-2
Typo
2015-12-16 19:11:24 +01:00
Laurent Destailleur
cd70b296c1 Merge pull request #4223 from fappels/develop-shipment-error-handling
Fix not complete output of error messages in shipment
2015-12-16 19:09:35 +01:00
Laurent Destailleur
d95be87e64 Merge pull request #4222 from grandoc/develop
Fix not complete output of error messages
2015-12-16 19:08:06 +01:00
Laurent Destailleur
7b17d2ce0c Merge pull request #4221 from mrsof/patch-1
FIX : Fatal error: Cannot access empty property
2015-12-16 19:07:24 +01:00
Laurent Destailleur
b2640498c4 Merge pull request #4219 from bafbes/patch-10
Fix the list of thirdparty must be restricted to customer for invoices
2015-12-16 19:04:01 +01:00
Laurent Destailleur
77e9ab763b Merge pull request #4216 from frederic34/patch-8
FIX option MAIN_DISABLE_FULL_SCANLIST was not working for stock movements
2015-12-16 19:02:53 +01:00
Laurent Destailleur
4ef832b94b Merge pull request #4215 from frederic34/patch-7
Update sms.php
2015-12-16 19:02:07 +01:00
Frédéric FRANCE
9e6698c6ca Update multiprix.php 2015-12-16 18:18:02 +01:00
Regis Houssin
c71d578931 Fix: for avoid division by 0 2015-12-16 16:39:50 +01:00
cla
1ebe6fb9b5 UPDATE:
sendings EN_US lang file
2015-12-16 16:21:05 +01:00
cla
ef487c48a4 NEW
Extrafields for:
- expedition, expeditiondet, livraison, livraisondet
2015-12-16 16:18:29 +01:00
Francis Appels
3568b889bf Update list.php
Fix page offset calculation
2015-12-16 15:42:24 +01:00
Regis Houssin
cb7f29b332 Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context 2015-12-16 13:32:44 +01:00
BENKE Charlie
afe3e6ac27 fix ErrorBadValueForParamNotAString shit one again... 2015-12-16 12:38:32 +01:00
aspangaro
5cd5413836 Accountancy add a column in table bookkeeping to validate operations 2015-12-16 05:22:50 +01:00
aspangaro
dfbc2814e7 Fix: Add an empty field for list of parent account - This value can be null 2015-12-15 21:10:53 +01:00
aspangaro
36bc1321cb Merge remote-tracking branch 'Upstream/develop' into develop-remove_zero 2015-12-15 20:50:49 +01:00
aspangaro
c1e77daeb1 New: Accountancy add a function to remove all zero at the right of the account.
Thanks to Florian
2015-12-15 20:48:06 +01:00
Laurent Destailleur
90dbfc4870 Fix: to avoid confusion between amount of payment and amount distributed
on invoice when a payment is done for several invoices, export of
payment can export both fields.
2015-12-15 15:52:20 +01:00
Sof
011f0fbb0b FIX : Typo error 2015-12-15 14:04:52 +01:00
BENKE Charlie
23e727048e Add some new translations for export feature 2015-12-15 10:35:11 +01:00
Laurent Destailleur
af85ade7ff Minor css fix 2015-12-15 10:24:31 +01:00
Laurent Destailleur
3e3dbf850f Fix: bad case for function 2015-12-15 09:44:17 +01:00
Laurent Destailleur
40269c3c70 Fix Remove syntax warnings 2015-12-15 09:43:39 +01:00
aspangaro
687370071b A function to remove zero at the end of the account 2015-12-14 21:38:30 +01:00
fappels
9fa742ceb2 [QUAL] Shipment error handling 2015-12-14 21:38:26 +01:00
Laurent Destailleur
ed88a4c398 Fix css 2015-12-14 21:38:04 +01:00
philippe grand
0fe64c6091 [Qual] Uniformize code 2015-12-14 20:54:55 +01:00
Sof
4c60569cc4 FIX : Fatal error: Cannot access empty property 2015-12-14 15:42:21 +01:00
Bahfir Abbes
e415a3ddf2 Update facture.php
fix change customer function in customer invoices - include customers or prospects only
2015-12-14 15:01:29 +01:00
Laurent Destailleur
b9aa80c4ca Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-14 10:33:32 +01:00
Laurent Destailleur
84ee18a11b Fix bad management of second level approvement 2015-12-14 10:33:18 +01:00
Frédéric FRANCE
af5bcc5312 Update mouvement.php 2015-12-14 09:31:40 +01:00
Laurent Destailleur
0ec62c05cc Fix bad var name. Removed warning. 2015-12-14 09:14:34 +01:00
Raphaël Doursenaud
bbe7498de6 Better Travis CI
NEW:
Cleaned up routines for better readability of both declaration and results.
PHP versions now really covered.
    The old code forced install of PHP and didn't use Travis provided versions.
    This resulted in the process not being executed with the declared PHP version.
Dropped MySQL in favor of MariaDB.
    This is now the FLOSS community standard.
    This should help avoid problems with buggy MySQL releases.
Fast finish enabled to show results faster.
Optimized tools installation with composer.
    The right version of the tool is installed for the PHP version under test.
New PHP linter to check for syntax errors.
    Parallelized for better speed.
Apache + PHP FPM for testing webservices.
    The previous mod_php configuration was not supported on Travis.
New global DEBUG environment variable to show verbose output with configuration files content.
IRC notification on #dolibarr@freenode for community awareness.

FIXES:
Bug in scripts preventing execution with environmentalized PHP.
Wrong detection of MAIN_URL_ROOT under specific circumstances.
    $_SERVER["DOCUMENT_ROOT"] empty and $_SERVER["SCRIPT_NAME"] populated.
Relative ignore directive in coding style ruleset to avoid bypassing test.
Unit test errors without an exit status.
    This prevented the CI from properly detecting and reporting the error.

TODOS:
PostgreSQL support.
    This one is tricky since we only have a MySQL dump and the syntax is not directly compatible.
SQLite support.
    Disabled in core at the moment.
Nginx + PHP FPM support.
    Test webservices on the second most popular webserver.
Run dev/* checks.
    We have a nice collection of scripts we could leverage.
Check Javascript.
Check CSS.
Check SQL.
2015-12-13 21:34:36 +01:00
Frédéric FRANCE
1aa232c4a7 Update CSMSFile.class.php 2015-12-13 21:14:53 +01:00
Frédéric FRANCE
65cebe37f3 Update sms.php 2015-12-13 21:12:08 +01:00
Laurent Destailleur
dc6ec91b2c Merge pull request #4183 from IonAgorria/patch-3
JS error preventing hiding of dates at object line
2015-12-13 19:57:37 +01:00
Laurent Destailleur
c5054c41cf Merge pull request #4211 from aspangaro/3.8-3879
Fix #3879 Wrong translation in the new expense report module
2015-12-13 19:56:55 +01:00
Laurent Destailleur
da8e38b253 Merge pull request #4213 from grandoc/develop
[Qual] Uniformize code
2015-12-13 19:56:43 +01:00
Laurent Destailleur
b949468b75 Merge pull request #4210 from IonAgorria/pricesel-fix
Price expression selector fix
2015-12-13 19:56:32 +01:00
Laurent Destailleur
4d11c8b733 Merge pull request #4212 from frederic34/patch-7
typo
2015-12-13 19:40:08 +01:00
Laurent Destailleur
646a198399 Merge pull request #4214 from frederic34/patch-8
typo
2015-12-13 19:39:56 +01:00
Laurent Destailleur
e37fc87cd5 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 17:34:06 +01:00
Laurent Destailleur
1978eebb69 Fix bad merge 2015-12-13 17:33:20 +01:00
Laurent Destailleur
ef13bd43b0 Fix bad merge 2015-12-13 17:27:55 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Laurent Destailleur
7db6ac592f FIX Option start tls of ldap was not correctly supported. 2015-12-13 15:51:52 +01:00
Laurent Destailleur
ef33691818 FIX Removed hard coded parameters for asterisk setup 2015-12-13 15:21:46 +01:00
Laurent Destailleur
3680202c1c Fix do not share color for title of table and title of pages 2015-12-13 14:39:12 +01:00
Frédéric FRANCE
9cc77787c5 typo 2015-12-12 16:10:36 +01:00
Laurent Destailleur
2a6fbe3526 Fix debug shipment doc generation (bad position of fields, code
differences, text size, ...)
2015-12-12 14:55:32 +01:00
Laurent Destailleur
0330d8237f Fix: Color too dark 2015-12-12 14:13:45 +01:00
Laurent Destailleur
84205b5be4 Fix: text too long 2015-12-12 14:12:53 +01:00
Laurent Destailleur
5f4be14dd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-12 13:19:55 +01:00
philippe grand
de0a13ae8f [Qual] Uniformize code 2015-12-12 10:59:02 +01:00
Frédéric FRANCE
442f669dc7 typo 2015-12-12 10:45:33 +01:00
aspangaro
c3acee56e2 Fix #3879 Wrong translation in the new expense report module 2015-12-12 10:06:11 +01:00
Ion Agorria
57102aefde Price expression selector fix 2015-12-12 01:38:24 +01:00
Juanjo Menent
4b9e87367f Merge pull request #4206 from grandoc/develop
[Qual] Close database handler should be after Footer
2015-12-11 21:35:14 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Ion Agorria
26b85d7cac Remove unnecesary variable 2015-12-11 18:28:55 +01:00
Laurent Destailleur
f71225742a Merge pull request #4178 from GPCsolutions/dolibarr-3953
Better javascript rounding
2015-12-11 17:59:34 +01:00
Laurent Destailleur
519e022c98 Merge pull request #4191 from braito4/patch-1
Update list.php
2015-12-11 17:28:40 +01:00
Laurent Destailleur
da5aa0cd36 Merge pull request #4200 from GPCsolutions/dolibarr-php7
[Qual] OOP constructor
2015-12-11 17:26:08 +01:00
Laurent Destailleur
1a58624775 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 17:05:38 +01:00
Laurent Destailleur
47fce16778 Merge branch 'develop' of https://github.com/FHenry/dolibarr into
FHenry-develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-12-11 17:04:19 +01:00
Laurent Destailleur
8ac189a1c3 Merge pull request #4199 from grandoc/develop
[Qual] Uniformize code
2015-12-11 16:59:25 +01:00
Laurent Destailleur
793e6e2a8f Example mut be excluded of packages 2015-12-11 16:56:25 +01:00
Laurent Destailleur
42436a37f4 Merge pull request #4194 from GPCsolutions/dolibarr-hidepass
[Security] Hide click to dial password
2015-12-11 16:46:04 +01:00
Laurent Destailleur
b85dd6647d Merge pull request #4175 from frederic34/patch-3
Update paypal.lib.php
2015-12-11 16:44:25 +01:00
Laurent Destailleur
9c20694668 Merge pull request #4203 from frederic34/patch-5
Update CSMSFile.class.php
2015-12-11 16:39:51 +01:00
Laurent Destailleur
335530b496 Merge pull request #4189 from apachler/develop
added social charges for Austria
2015-12-11 16:39:16 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
philippe grand
9b0dd8159e [Qual] Close database handler should be after Footer 2015-12-11 12:29:19 +01:00
Florian HENRY
8edf3c65c6 work on accounting 2015-12-11 11:46:22 +01:00
Florian HENRY
71d0024b27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 11:31:37 +01:00
philippe grand
8ccafc6e36 [Qual] Uniformize code 2015-12-11 09:54:30 +01:00
Ion Agorria
f34fb0d82d More consistent check 2015-12-11 03:09:09 +01:00
Frédéric FRANCE
e193d9be97 Update CSMSFile.class.php 2015-12-10 23:08:21 +01:00
Raphaël Doursenaud
3e2309d0e6 NEW Factorized price2numjs into lib_head.js.php
Used public domain code from the MDN to provide a robust decimal
rounding implementation.

Warning for developers: the path of the javascript file has changed.
Please update your scripts.
2015-12-10 17:03:00 +01:00
Frédéric FRANCE
ac04fdbd9a Update paypal.php 2015-12-10 16:49:55 +01:00
Raphaël Doursenaud
5aaafc3f8a [Qual] OOP constructor
Using class name as constructor method is deprecated in PHP 7
2015-12-10 16:37:37 +01:00
Frédéric FRANCE
5f0c7b6c38 Update paypal.lang 2015-12-10 16:31:11 +01:00
Frédéric FRANCE
9bb9e6b787 Update paypal.php 2015-12-10 16:29:35 +01:00
Frédéric FRANCE
9e0817ac05 Update paypal.lib.php 2015-12-10 16:28:22 +01:00
philippe grand
fc8c12d6f6 [Qual] Uniformize code 2015-12-10 16:14:37 +01:00
Ion Agorria
ceb2920769 Better undefined CKEDITOR fix 2015-12-10 14:17:08 +01:00
Laurent Destailleur
3bcdc5c9c0 Merge pull request #4181 from grandoc/develop
[Qual] Uniformize code
2015-12-10 13:35:44 +01:00
Laurent Destailleur
dc2b5bd495 Merge pull request #4176 from GPCsolutions/dolibarr-composer
Updated libraries
2015-12-10 13:15:33 +01:00
Laurent Destailleur
aef427423f Merge pull request #4174 from defrance/patch-86
db->close must be do after llx_footer
2015-12-10 13:08:55 +01:00
Laurent Destailleur
c497a5e526 Merge pull request #4171 from IonAgorria/fix-dateranges
Fix date handling for hours/mins in some pages
2015-12-10 13:08:30 +01:00
Laurent Destailleur
3e3a99ad5e Merge pull request #4170 from openthink-laurent/fix-uniqueness-objects-reference
Fix uniqueness of objects reference
2015-12-10 13:07:16 +01:00
Andreas Pachler
019bc7ba8e added austrian Regions, Departements, Forme Juridique and social charges to migration file from 3.8 to 3.9 2015-12-10 12:56:05 +01:00
Raphaël Doursenaud
4f359616ce [Security] Hide click to dial password 2015-12-09 18:16:08 +01:00
Ion Agorria
bbfd138896 Missed another CKEDITOR ref 2015-12-09 18:00:05 +01:00
Florian HENRY
b80518efb4 fix travis 2015-12-09 14:26:04 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
braito4
ab274ba1e3 Update list.php
Doble page title
2015-12-09 13:10:12 +01:00
Florian HENRY
96a95d6ae1 Debug accountancy on 3.9 2015-12-09 12:55:08 +01:00
Florian HENRY
ea1a81f5f4 FIX : Comptability when multiple account charts 2015-12-09 11:53:38 +01:00
Andreas Pachler
4885c64ab3 added social charges for Austria 2015-12-09 09:32:21 +01:00
BENKE Charlie
898f637457 Update fichinter.php 2015-12-08 18:02:25 +01:00
Ion Agorria
238f977002 JS error preventing hiding of dates at object line
The "if (CKEDITOR)" gives "ReferenceError: CKEDITOR is not defined" at JS console causing the next code to don't execute, is this code obsolete?
2015-12-08 15:45:24 +01:00
philippe grand
01c6728aa9 [Qual] Uniformize code 2015-12-08 11:35:08 +01:00
Raphaël Doursenaud
3f9efc537b FIX #3953 Don't round supplier price
The price is already rounded when inserted on the product page.
It's also rounded at display.
There's no need to round it here.
Rounding it leads to serious calculation errors.
2015-12-07 14:35:04 +01:00
Raphaël Doursenaud
2cf36d157f FIX #3953 Don't round supplier price
The price is already rounded when inserted on the product page.
It's also rounded at display.
There's no need to round it here.
Rounding it leads to serious calculation errors.
2015-12-07 14:24:24 +01:00
Raphaël Doursenaud
9257bfc5df Updated mobiledetect to 2.8.17 2015-12-07 13:53:59 +01:00
Raphaël Doursenaud
5dfa9ba369 Updated TCPDF to 6.2.12 2015-12-07 13:39:45 +01:00
Frédéric FRANCE
9d0f096e47 Update paypal.lib.php 2015-12-07 11:46:47 +01:00
BENKE Charlie
bcf6c1243c db close must do AFTER llxFooter() call 2015-12-07 11:03:27 +01:00
BENKE Charlie
63fd4cd6c0 db close must do AFTER llxFooter() call 2015-12-07 11:01:48 +01:00
BENKE Charlie
c60178c95f db close must do AFTER llxFooter() call 2015-12-07 11:00:26 +01:00
BENKE Charlie
771f7183d4 db close must do AFTER llxFooter() call 2015-12-07 10:56:37 +01:00
Ion Agorria
1dc5854535 Fix date handling for hours/mins in some pages 2015-12-07 03:59:03 +01:00
Laurent Léonard
05234390f2 Fix uniqueness of objects reference 2015-12-07 02:02:03 +01:00
Laurent Léonard
7e31c8f38f Fix decimals in payments of supplier invoices 2015-12-07 01:27:08 +01:00
Laurent Destailleur
a209d18649 FIX Can use formated float number on old expense report module. 2015-12-06 19:51:28 +01:00
Laurent Destailleur
9bf7f5a78b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-06 19:45:04 +01:00
Laurent Destailleur
984068c136 Fix length of password too low (password was truncated making them
inoperent)
2015-12-06 19:17:39 +01:00
Laurent Destailleur
5710bcd38a Merge pull request #4165 from AlainRnet/patch-2
Update const.php
2015-12-06 14:46:15 +01:00
Laurent Destailleur
f73c059bc4 Merge pull request #4159 from belyas/develop
addLogCP and updateSoledCP methodes throwing warnings when assigning leave for a user
2015-12-06 14:44:46 +01:00
Laurent Destailleur
939a36428c Merge pull request #4156 from grandoc/develop
[Qual] Uniformize code
2015-12-06 14:42:58 +01:00
Laurent Destailleur
2aca50f7f8 Removed useless string 2015-12-06 13:56:15 +01:00
Laurent Destailleur
9c227d154e Clean duplicate translation key 2015-12-06 13:37:48 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to
remove around 50 duplicates.
2015-12-06 13:34:57 +01:00
Laurent Destailleur
d4268c079f Fix syntax error 2015-12-06 12:23:49 +01:00
Laurent Destailleur
0279e99b0a Update warning for mysql 5.5.4* bug 2015-12-06 12:04:34 +01:00
AlainRnet
50cf96bd16 Update const.php
link to help file
2015-12-06 12:01:59 +01:00
Laurent Destailleur
745875d21e NEW Can choose fields to show on project list 2015-12-06 01:19:27 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
497c30d994 NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:38:45 +01:00
Laurent Destailleur
9d3451b31d NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:31:32 +01:00
Laurent Destailleur
ff4f1e7a5b Debug 3.9 2015-12-05 19:20:39 +01:00
Laurent Destailleur
e002021d7d Fix td balance 2015-12-05 17:49:08 +01:00
yassine belkaid
8c22274300 Fixed assigning exceptional leave for a user 2015-12-05 00:41:00 +00:00
yassine belkaid
1075940e93 ignore conf/conf.php file 2015-12-05 00:37:32 +00:00
Laurent Destailleur
4a2bda3491 Look enhancement 2015-12-04 23:25:34 +01:00
philippe grand
f640486c8b [Qual] Uniformize code 2015-12-04 22:50:03 +01:00
Laurent Destailleur
5cd43d2df0 Some debug on new features 2015-12-04 20:51:34 +01:00
philippe grand
94fe00fe8d [Qual] Uniformize code 2015-12-04 19:45:39 +01:00
Laurent Destailleur
eb795a7a9d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-04 18:39:39 +01:00
Laurent Destailleur
c91aa0aa90 Merge pull request #4154 from GPCsolutions/dolibarr-md-icons
Material Design icons
2015-12-04 18:39:26 +01:00
Laurent Destailleur
8c03e46a83 Removed a TODO 2015-12-04 18:33:57 +01:00
Laurent Destailleur
b169b976b7 Merge pull request #4152 from GPCsolutions/dolibarr-md
Fixed md theme name
2015-12-04 18:30:01 +01:00
Laurent Destailleur
d0d7e83929 Merge pull request #4149 from GPCsolutions/dolibarr-php7
[Qual] OOP detection of PHP MySQL driver
2015-12-04 18:25:14 +01:00
Laurent Destailleur
6542da404e Merge pull request #4129 from aspangaro/develop-bank
New HRM Add bank tab in user to pay salary or expense report
2015-12-04 18:23:47 +01:00
Raphaël Doursenaud
87d6a5926b Fixed md theme name 2015-12-04 18:05:04 +01:00
Raphaël Doursenaud
a8f67808de NEW Used matching icons for Material Design theme
Icons from https://www.google.com/design/icons/
Licenced under CC BY 4.0
2015-12-04 18:04:41 +01:00
Raphaël Doursenaud
1dfd3f396e Fixed md theme name 2015-12-04 18:04:41 +01:00
Florian HENRY
955fad910d FIX : Bug: $this is not accessible in static context in
Mailing::libStatutDest #4050
2015-12-04 17:32:17 +01:00
Laurent Destailleur
bcadc33e31 Debug visibility on task/projects 2015-12-04 15:37:28 +01:00
aspangaro
6598ac6745 Add rights to see tab (hrm->employee->read) 2015-12-04 12:48:36 +01:00
aspangaro
c30728326e Merge remote-tracking branch 'Upstream/develop' into develop-bank 2015-12-04 12:41:51 +01:00
Laurent Destailleur
e6ebc9c293 More complete tooltip help 2015-12-04 12:24:36 +01:00
Laurent Destailleur
a24cbf5585 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-04 12:12:23 +01:00
Laurent Destailleur
4dd1cb3e77 Theme MD looks ready for 3.9 now. 2015-12-04 12:12:12 +01:00
Laurent Destailleur
2b149aa514 Merge pull request #4148 from AlainRnet/develop
Update fraise.modules.php
2015-12-04 10:31:34 +01:00
Laurent Destailleur
53a8cb4475 Merge pull request #4130 from bafbes/develop
add constant FICHINTER_EMPTY_LINE_DESC to allow empty line descriptions in interventions
2015-12-04 10:30:51 +01:00
Laurent Destailleur
7d7a978ba0 Merge pull request #4145 from FHenry/3.8
FIX :  Contract date inconsistency between /comm/card.php and #4089
2015-12-04 10:25:50 +01:00
Raphaël Doursenaud
b45d4a2a51 [Qual] OOP detection of PHP MySQL driver 2015-12-03 22:31:13 +01:00
AlainRnet
ebc1105b5c Update fraise.modules.php
following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type.
Thanks in advance for feedback
2015-12-03 21:09:09 +01:00
Bahfir Abbes
fb692f4cd5 Update card.php 2015-12-03 19:10:15 +01:00
Laurent Destailleur
43ab23ca28 Fix doxygen 2015-12-03 14:54:39 +01:00
Laurent Destailleur
6be9a04a56 Fix detection of last version on sourceforge 2015-12-03 14:52:13 +01:00
Laurent Destailleur
e4f0b9ba15 Fix detection of last version on sourceforge 2015-12-03 14:46:34 +01:00
fmarcet
eb98bd1e78 FIX: Not delete a product when have customer price 2015-12-03 14:02:26 +01:00
Laurent Destailleur
1658bee81c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-03 13:06:37 +01:00
Laurent Destailleur
480a398f36 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/holiday/card.php
	htdocs/resource/list.php
2015-12-03 13:06:20 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
Florian HENRY
3dec67ffdf Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-03 12:58:39 +01:00
Laurent Destailleur
7105fabb79 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/langs/en_US/users.lang
	htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
Laurent Destailleur
64e35255ae Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-03 12:47:32 +01:00
Laurent Destailleur
a7d03af4af Fix sending emails from mergepedtool was just doing wrong things. 2015-12-03 12:47:21 +01:00
Laurent Destailleur
6763b5baa0 Merge pull request #4144 from FHenry/develop
FIX : Cannot change the date of a contract #4088
2015-12-03 12:06:48 +01:00
Laurent Destailleur
c088de517e Merge pull request #4140 from GPCsolutions/dolibarr-sql
[Qual] More robust sorting
2015-12-03 12:06:01 +01:00
Laurent Destailleur
540609d5ed Merge pull request #4139 from bafbes/patch-9
Update products.lang - include translation for units key in product/card.php
2015-12-03 12:01:10 +01:00
Laurent Destailleur
6b3e20dcdc Merge pull request #4138 from GPCsolutions/dolibarr-4137
Fix #4137 Salaries parameter saving
2015-12-03 12:00:47 +01:00
Laurent Destailleur
1694481df8 Merge pull request #4134 from FHenry/3.7
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-03 11:58:23 +01:00
Laurent Destailleur
c86d4b51b1 Merge pull request #4133 from ricardomm85/3.8
minor fix accessing $db
2015-12-03 11:57:25 +01:00
Florian HENRY
10a925f7b4 FIX: WHERE 1=1 2015-12-03 11:52:41 +01:00
Laurent Destailleur
63879c1ca6 Merge pull request #4122 from mrsof/patch-7
FIX: Cannot set property '_renderItem of undefined
2015-12-03 11:52:30 +01:00
Laurent Destailleur
7bad058f47 Merge pull request #4114 from fappels/3.8_fix_round_buyprice
FIX #3953 rounding of buying price
2015-12-03 11:48:09 +01:00
Florian HENRY
ee08c4afc4 Display the ref_supplier inside the contract list of /comm/card.php
#4090
2015-12-03 11:03:40 +01:00
Florian HENRY
b4160c7f81 Cannot change the date of a contract #4088 2015-12-03 10:58:06 +01:00
Florian HENRY
33e73afda6 FIX : Cannot change the date of a contract #4088 2015-12-03 10:51:03 +01:00
Florian HENRY
281eaf2987 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-03 10:27:23 +01:00
Laurent Destailleur
cb8227f086 Fix syntax error 2015-12-03 10:04:13 +01:00
Laurent Destailleur
2f02919c70 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-03 10:01:51 +01:00
Laurent Destailleur
c664a492e6 Removed a not used field making mysql error (reserved word). Also this
field is not required by dolibarr core.
2015-12-03 10:01:40 +01:00
Laurent Destailleur
055e650adf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-02 23:23:38 +01:00
Laurent Destailleur
9aaab2c1dc Work on select fields on project list 2015-12-02 23:20:19 +01:00
Laurent Destailleur
574b270da0 Work on the "mass action" feature. Can run mass action on
result of a select.
2015-12-02 22:00:39 +01:00
Raphaël Doursenaud
0c5c762c1c [Qual] More robust sorting
Only allow valid values and discard others.
Do not use user supplied data in SQL query.
2015-12-02 21:15:59 +01:00
Bahfir Abbes
7841c97387 Update products.lang 2015-12-02 19:34:02 +01:00
Bahfir Abbes
134adcf637 Update products.lang 2015-12-02 18:55:51 +01:00
Raphaël Doursenaud
e1d5b4483a Fix #4137 Salaries parameter saving
Button was outside of the form.
2015-12-02 18:31:38 +01:00
Florian HENRY
bd632cf2b0 FIX : Use "WHERE true" instead of "WHERE 1" #4132 2015-12-02 12:12:26 +01:00
ricardomm
eb504ffacc minor fix accessing $db 2015-12-02 11:53:23 +01:00
Bahfir Abbes
5360ea65bf Update card.php 2015-12-01 21:26:04 +01:00
aspangaro
e1c8e6d8f6 Remove useless code 2015-12-01 20:27:29 +01:00
aspangaro
09a6cc9625 wrong table 2015-12-01 20:17:14 +01:00
abb
46611908ae add constant FICHINTER_EMPTY_LINE_DESC to allow empty line descriptions in interventions 2015-12-01 11:10:05 +01:00
aspangaro
882b66c586 HRM - Add bank tab in user to pay salary or expense report 2015-12-01 06:56:26 +01:00
Laurent Destailleur
6df4948a73 Fix text 2015-12-01 03:12:12 +01:00
Laurent Destailleur
357bc7a00c Fix color link 2015-11-30 21:40:14 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
aspangaro
b1122b55d4 Fix : accountancy code on finance journal is not a constant 2015-11-30 21:07:27 +01:00
Sof
daa8399764 FIX: Cannot set property '_renderItem of undefined
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
2015-11-30 20:31:42 +01:00
Sof
292d3ba959 FIX: Cannot set property '_renderItem of undefined
http://stackoverflow.com/questions/9513251/cannot-set-property-renderitem-of-undefined-jquery-ui-autocomplete-with-html
2015-11-30 20:28:36 +01:00
Laurent Destailleur
d6d2a2fadb Merge pull request #4118 from patas-monkey/patch-1
Progress column not wide enough for 100%
2015-11-30 19:16:54 +01:00
Laurent Destailleur
62634a1db8 Merge pull request #4115 from mrsof/patch-3
FIX: Multiple syntax errors
2015-11-30 19:14:37 +01:00
Laurent Destailleur
863f81160f Merge pull request #4116 from IonAgorria/patch-2
Only print : when both $h and $m are set
2015-11-30 18:54:50 +01:00
Sof
09b61fd185 Update extrafields.class.php 2015-11-30 18:06:15 +01:00
Sof
5dab92836b FIX: Warning: implode(): Invalid arguments passed
Declare array type before implode to avoid warning
2015-11-30 12:27:58 +01:00
Romain DESCHAMPS
94101412e9 Progress column not wide enough for 100%
Progress column not wide enough for 100%
2015-11-30 12:20:14 +01:00
Laurent Destailleur
a12e959833 Do not show billed status after order status 2015-11-29 16:33:50 +01:00
Ion Agorria
d518b24d55 Only print : when both $h and $m are set 2015-11-29 16:19:30 +01:00
Sof
1b62cd4481 FIX: Multiple syntax errors 2015-11-29 16:05:14 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
fappels
4a0ea97772 FIX #3953 rounding of buying price
fix javascript for rounding of buying price
2015-11-29 15:34:43 +01:00
Laurent Destailleur
bb627e32d3 Fix: Form should use POST. GET has too much bad side effects. 2015-11-29 14:09:22 +01:00
Laurent Destailleur
b0e938fab4 Fix missing td cell 2015-11-29 13:15:02 +01:00
Laurent Destailleur
480623a6d5 Uniformize GUI. All lists must have a search on status at end and last
column is dedicaded to future "mass action checkbox".
2015-11-29 13:03:46 +01:00
Laurent Destailleur
b2a2f5b449 Merge pull request #4110 from frederic34/patch-5
Update list.php
2015-11-29 02:01:20 +01:00
Laurent Destailleur
bbece06b8e Merge pull request #4109 from frederic34/patch-3
Navigation to loan list
2015-11-29 02:01:02 +01:00
Laurent Destailleur
ebe4867ab1 Remove useless information tomake screen lighter 2015-11-29 01:23:41 +01:00
Laurent Destailleur
263be5aa0a Avoid 2 lines on mall screen 2015-11-29 01:16:56 +01:00
Laurent Destailleur
7b6d8dd23e Fix for smartphone 2015-11-29 01:13:23 +01:00
Frédéric FRANCE
79263d06e9 Update index.php 2015-11-28 20:37:09 +01:00
Frédéric FRANCE
6d7e360498 Update list.php 2015-11-28 20:33:18 +01:00
Laurent Destailleur
5df193ec93 Uniformize code 2015-11-28 20:25:50 +01:00
Laurent Destailleur
5d5cfd498a Add holiday date functions into PHPUnit 2015-11-28 19:54:16 +01:00
Frédéric FRANCE
e3443365d2 Navigation to loan list 2015-11-28 19:08:52 +01:00
Laurent Destailleur
acbbb70c44 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-28 17:36:02 +01:00
Laurent Destailleur
3e403720e6 FIX User is selected when choosing menu "My projects"
Graph of opportunities is moved into an include file.
2015-11-28 17:35:52 +01:00
Laurent Destailleur
d00ebd54f9 Merge pull request #4107 from aspangaro/develop-member
Fix adherent width colomn of create type form
2015-11-28 16:32:34 +01:00
Laurent Destailleur
fcdb3af708 Merge pull request #4106 from aspangaro/develop-skype
New: Better integration of skype for dolibarr 3.9
2015-11-28 16:31:35 +01:00
Laurent Destailleur
e6806611a6 Merge pull request #4105 from atm-ph/fix_38_select_projects_list
FIX jquery select of project generate js error on change event
2015-11-28 16:30:21 +01:00
Laurent Destailleur
e72f4cb063 Merge pull request #4102 from fmarcet/3.6
Fix: Bug when idprof is mandatory on thrid creation and we use multicompany
2015-11-28 16:27:16 +01:00
Laurent Destailleur
2ce00b2956 Merge pull request #4099 from GPCsolutions/3.6-4097
FIX #4097 Public holiday calculation
2015-11-28 16:11:28 +01:00
Laurent Destailleur
5b22eee938 FIX #4099 2015-11-28 16:11:15 +01:00
Laurent Destailleur
3485e351a4 Fix do not jump to top of page when clicking on "Link to order" 2015-11-28 15:46:20 +01:00
Laurent Destailleur
826c4de26b Uniformize and debug module expense report. 2015-11-28 15:28:59 +01:00
aspangaro
8bf66d2f58 Remove skype also in member card - already present in dol_banner 2015-11-28 15:09:08 +01:00
aspangaro
0a3ab4617c Fix adherent width colomn of create type form 2015-11-28 14:52:13 +01:00
aspangaro
d12e3ca91f Finish work on better integration of skype 2015-11-28 14:43:16 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
phf
cbcb79b1eb FIX jquery select of project generate js error on change event 2015-11-27 16:58:28 +01:00
Frédéric FRANCE
e6033369a8 Update resource.class.php 2015-11-26 20:33:07 +01:00
Frédéric FRANCE
1b9039af36 Update list.php 2015-11-26 20:30:11 +01:00
fmarcet
208bf2545f Fix: Bug when idprof is mandatory on thrid creation and we use
multicompany
2015-11-26 17:14:03 +01:00
aspangaro
9817ce8b20 Merge remote-tracking branch 'Upstream/develop' into develop-skype 2015-11-26 07:12:04 +01:00
aspangaro
cb6038e125 Better code for admin skype 2015-11-26 07:10:13 +01:00
aspangaro
37da315af6 Remove old code 2015-11-26 06:30:09 +01:00
aspangaro
9a2259c681 Correct button 'Export' and 'Write bookkeeping' on finance journal 2015-11-26 06:19:24 +01:00
Laurent Destailleur
a6d8f943df Fix several bugs into leave requets module 2015-11-26 02:12:37 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Laurent Destailleur
f814bc11a0 Clean packaging 2015-11-26 01:27:59 +01:00
Laurent Destailleur
1608fec937 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-26 00:47:29 +01:00
Laurent Destailleur
f353464bce Prepare code to fix #4095 2015-11-26 00:47:17 +01:00
Laurent Destailleur
a1a5eba2de Merge pull request #4096 from braito4/patch-1
Part solution bug #4095
2015-11-26 00:34:04 +01:00
Laurent Destailleur
a454e92656 Increase size of combo list 2015-11-26 00:31:12 +01:00
Laurent Destailleur
bc6d04e495 Typo 2015-11-26 00:08:34 +01:00
Laurent Destailleur
ddd0f8224f Picto was not visible onto login page, we keep this behaviour. 2015-11-26 00:08:24 +01:00
Laurent Destailleur
02ac828e4c Merge pull request #4075 from GPCsolutions/dolibarr-4074
Fix #4074 Properly save user theme settings
2015-11-25 23:51:30 +01:00
Laurent Destailleur
f79aeeeb0b Merge pull request #4068 from aspangaro/develop-accountancy
Fix: typo on finance journal
2015-11-25 23:33:29 +01:00
Laurent Destailleur
8746ee1310 Merge pull request #4067 from aspangaro/develop-donation
NEW: Donation complete cerfa 11580*03 Fr - Thanks Benoit21
2015-11-25 23:33:13 +01:00
Laurent Destailleur
9d10533f3d Merge pull request #4066 from aspangaro/develop-hrm
Fix: Auguria Menu & wrong table in dictionary HRM
2015-11-25 23:32:36 +01:00
Laurent Destailleur
ad087a75e6 Fix missing php 2015-11-25 23:32:00 +01:00
Laurent Destailleur
66a1becbf9 Merge pull request #4065 from frederic34/patch-5
Typo
2015-11-25 23:21:39 +01:00
Laurent Destailleur
2d8c2221d8 NEW Provide an easier way to understand if an order can be shipped. 2015-11-25 23:20:41 +01:00
Laurent Destailleur
28c77cbb49 Merge pull request #3994 from frederic34/patch-3
Not shippable if quantity in all order are greater than in stock
2015-11-25 22:26:15 +01:00
Laurent Destailleur
1caf148dc6 Merge pull request #4053 from marcosgdf/bug-3987
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
2015-11-25 22:24:56 +01:00
Laurent Destailleur
c8da4ee9f3 Merge pull request #4058 from marcosgdf/bug-3293
FIX #3293 Login page form icons not shown
2015-11-25 22:18:00 +01:00
aspangaro
8c0dffd24e Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy 2015-11-25 20:23:41 +01:00
aspangaro
3457a732f5 New: Better integration of skype 2015-11-25 20:19:18 +01:00
Raphaël Doursenaud
973e42d10f FIX #4097 Public holiday calculation
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
2015-11-25 19:34:11 +01:00
braito4
677cba01ce Part solution bug #4095
It allow us to deactivate the link to a project queries to lower the page workload.
2015-11-25 18:58:47 +01:00
Laurent Destailleur
1d9e9ccaba NEW Add filter on status on shipments 2015-11-25 17:34:26 +01:00
Laurent Destailleur
cf98c7a6f5 Police plus grande 2015-11-25 17:11:08 +01:00
Laurent Destailleur
2593022684 Fix bad css 2015-11-25 16:45:25 +01:00
Laurent Destailleur
5568ff1c54 Fix bad picto on export 2015-11-25 16:41:40 +01:00
Marcos García
a30f7d543a Corrected fix 2015-11-25 10:19:11 +01:00
Raphaël Doursenaud
91ce70a6e9 FIX #4081 Added missing translation 2015-11-23 17:25:10 +01:00
Maxime Kohlhaas
da51a28766 Fix : situation percent should be 100 by default 2015-11-23 17:22:29 +01:00
Raphaël Doursenaud
231196437c Fix #4074 Properly save user theme settings 2015-11-23 14:21:25 +01:00
Laurent Destailleur
a1824955f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-23 12:21:02 +01:00
Laurent Destailleur
12358c9721 FIX The import help was not visible on calculated fields 2015-11-23 12:20:43 +01:00
Laurent Destailleur
61b46352b7 Dash line was not visible. 2015-11-23 09:36:34 +01:00
aspangaro
0899e7392b Fix: typo on finance journal 2015-11-22 22:11:22 +01:00
aspangaro
71189248d9 Correct description 2015-11-22 21:35:19 +01:00
aspangaro
5bed70b04e New: Donation complete cerfa 11580*03 Fr - Thanks Benoit21 2015-11-22 21:31:05 +01:00
aspangaro
f9e82721d7 Fix: Auguria Menu & wrong table in dictionary HRM 2015-11-22 20:13:48 +01:00
Frédéric FRANCE
3d05b53a62 Typo 2015-11-22 19:08:38 +01:00
Laurent Destailleur
ffeae34f51 Update doc 2015-11-22 18:41:35 +01:00
Laurent Destailleur
0c958521ac Fix cleaning of lines was not working 2015-11-22 17:46:25 +01:00
Laurent Destailleur
73bcc3bfe3 The temp dir for cache used by rester is correctly managed: No temp or
data files must be stored outside of documents directory.
2015-11-22 17:39:13 +01:00
Laurent Destailleur
296e04022f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-22 17:19:45 +01:00
Laurent Destailleur
99fa751edc Test lib is available 2015-11-22 17:19:20 +01:00
Laurent Destailleur
3c55479705 Restler #3544 2015-11-22 17:17:06 +01:00
Laurent Destailleur
3aa25cd2be Merge pull request #4064 from frederic34/escpos
Add profile escpos printer
2015-11-22 17:09:15 +01:00
Laurent Destailleur
91f1acd1f1 Merge pull request #4063 from grandoc/develop
fix : Typo and translation
2015-11-22 17:07:22 +01:00
Laurent Destailleur
3f87b30327 Use same way to obfuscate key than password 2015-11-22 14:21:12 +01:00
frederic34
6b4b70bdbb translations and help 2015-11-22 14:11:33 +01:00
Laurent Destailleur
a94aedb171 Minor css fix 2015-11-22 12:33:56 +01:00
Laurent Destailleur
cb3765bc92 Debug module Resource 2015-11-22 12:23:10 +01:00
Laurent Destailleur
e438d76df9 NEW Option encrypt password into databae is set to on by default on
first install.
2015-11-22 11:32:31 +01:00
frederic34
bfd97d5226 Add profile escpos printer 2015-11-22 11:04:27 +01:00
philippe grand
f4c8b5e7f8 missing translation 2015-11-22 10:46:17 +01:00
philippe grand
210c6c67cd better translation and missing translation 2015-11-22 10:40:04 +01:00
philippe grand
9cdf0f427e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-22 10:15:57 +01:00
Laurent Destailleur
c7447b0899 Add thirdparty of project into project summary of project home page.
Total use a different color
2015-11-21 20:25:28 +01:00
Laurent Destailleur
6f7a3f2c66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-21 20:00:50 +01:00
Laurent Destailleur
e3c6e4ebe5 NEW Add planned workload and declared progress on project summary list
on project home page (data aggregated from tasks of project)
2015-11-21 20:00:38 +01:00
philippe grand
0408e309f8 fix : Typo and translation 2015-11-21 19:13:34 +01:00
Laurent Destailleur
7b0a9fabab FIX Order last name / firstname in user list must be done according to
option
2015-11-21 18:26:25 +01:00
Laurent Destailleur
7bde781206 Merge pull request #4061 from marcosgdf/bug-3231
FIX #3231 [Members] Public subscription page displays GeoIP error
2015-11-21 17:58:29 +01:00
Laurent Destailleur
c8cf06c14b Merge pull request #4059 from fappels/develop_fix_defineBuyPrice
Fix defineBuyPrice no min price is not error
2015-11-21 17:53:59 +01:00
Laurent Destailleur
dc6496fdf3 Merge pull request #4054 from marcosgdf/bug-3508
FIX #3508 Useless tooltip in 3.8 boxes
2015-11-21 17:49:09 +01:00
Laurent Destailleur
4481c4f978 Merge pull request #4052 from marcosgdf/bug-4049
FIX #4049 PHP warning when trying to access a non-existing product/service
2015-11-21 17:47:03 +01:00
Laurent Destailleur
295d83001a Merge pull request #4051 from marcosgdf/bug-4018
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined
2015-11-21 17:46:26 +01:00
Laurent Destailleur
54b6ff02c0 Merge pull request #4048 from FHenry/3.8
FIX Missing fields managed by update_customer_modtime in 3.8
2015-11-21 17:46:02 +01:00
philippe grand
e78794cab2 [Qual] Uniformize code 2015-11-21 17:38:09 +01:00
philippe grand
55bab28b9c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-21 17:15:56 +01:00
Laurent Destailleur
c15c0f6fbb Minor css fix 2015-11-21 15:31:27 +01:00
Laurent Destailleur
548ff26628 Focus on textarea works also when ckeditor is on 2015-11-21 13:42:01 +01:00
Marcos García de La Fuente
a456d21249 FIX #3231 [Members] Public subscription page displays GeoIP error 2015-11-21 13:25:09 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
fappels
ecd3114683 Fix defineBuyPrice no min price is not error
No min buy price is not error, return 0 if no buyprice set
2015-11-21 12:35:45 +01:00
Laurent Destailleur
758b8e1f7e Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/boxes/box_project.php
2015-11-21 12:32:03 +01:00
Laurent Destailleur
c04743aa84 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-11-21 12:23:51 +01:00
Marcos García de La Fuente
3fbe10a578 FIX #3293 Login page form icons not shown 2015-11-21 12:18:29 +01:00
Marcos García de La Fuente
9f27e2323f FIX #3734 Do not show empty links of deleted source objects in stock movement list 2015-11-21 11:51:23 +01:00
Marcos García de La Fuente
4bf6cf4e65 FIX #3508 Useless tooltip in 3.8 boxes 2015-11-21 11:24:18 +01:00
Marcos García de La Fuente
e8fc5f0d3a FIX #3987 Undefined variable $newref in CommandeFournisseur::approve 2015-11-21 11:00:56 +01:00
Marcos García de La Fuente
eba5832d3a FIX #4049 PHP warning when trying to access a non-existing product/service 2015-11-21 10:58:58 +01:00
Marcos García de La Fuente
e31a8f25a2 FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined 2015-11-21 10:55:23 +01:00
Florian HENRY
c0d29d2a15 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-21 10:10:42 +01:00
philippe grand
32f420eefa [Qual] Uniformize code 2015-11-21 05:20:08 +01:00
philippe grand
928c44b04f Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-21 04:52:19 +01:00
Laurent Destailleur
69757210ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-21 02:40:21 +01:00
Laurent Destailleur
2eba3c9e81 Comment 2015-11-21 02:39:49 +01:00
Laurent Destailleur
30f0b6e2e8 Merge pull request #4046 from marcosgdf/bug-4016
FIX #4016 User link is not correctly formed in emailing receivers
2015-11-21 02:14:08 +01:00
Laurent Destailleur
94fdff9a46 Merge pull request #4045 from marcosgdf/bug-4043
FIX #4043 Incorrect translation in error mesage in menu creation admin page
2015-11-21 02:08:55 +01:00
Laurent Destailleur
bfaa8d539f Merge pull request #4039 from frederic34/patch-9
typo
2015-11-21 01:51:56 +01:00
Laurent Destailleur
60724df496 Merge pull request #4038 from atm-maxime/develop
NEW add info page on product card
2015-11-21 01:51:32 +01:00
Laurent Destailleur
9db71098ac Merge pull request #4031 from FHenry/develop
PG SQL
2015-11-21 01:50:47 +01:00
Laurent Destailleur
1bea9917c4 Introduce version on resource link, so no cache effect after upgrading 2015-11-21 00:52:20 +01:00
Laurent Destailleur
a79e8d33f1 FIX Bad meteo icon 2015-11-21 00:43:35 +01:00
Laurent Destailleur
97dc4c346b Merge pull request #4026 from aspangaro/develop-hrm
New: FR #3699 HRM Add address informations in user card
2015-11-21 00:27:29 +01:00
Laurent Destailleur
45d6635bf6 Merge pull request #4025 from ndrosis/3.8
FIX utf-8 characters in the mask mercure does not break counter
2015-11-21 00:26:38 +01:00
Laurent Destailleur
611d8f3e86 Merge pull request #4021 from defrance/patch-75
add odt feature on supplier admin page
2015-11-21 00:24:15 +01:00
Laurent Destailleur
a906774595 Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order
NEW 3.9 add billed status for supplier order
2015-11-21 00:20:17 +01:00
Laurent Destailleur
bf2af33b89 Merge pull request #4015 from ParisLiakos/develop
Add a trigger for product translation deletion
2015-11-21 00:19:40 +01:00
Laurent Destailleur
925b6a7c98 Merge pull request #4014 from frederic34/patch-8
Update list.php
2015-11-21 00:18:42 +01:00
Laurent Destailleur
5e0b5cb75d Merge pull request #4009 from frederic34/patch-7
Update list.php
2015-11-21 00:18:29 +01:00
Laurent Destailleur
e12760bb48 Merge pull request #3995 from frederic34/patch-5
Update list.php
2015-11-21 00:18:14 +01:00
Laurent Destailleur
552ecbcd95 Merge pull request #3964 from aspangaro/develop-hrm3
HRM : Work in progress
2015-11-21 00:14:41 +01:00
Laurent Destailleur
401b2a7389 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/theme/md/style.css.php
2015-11-20 23:47:07 +01:00
Laurent Destailleur
db27e08b7d Work on md style 2015-11-20 23:45:31 +01:00
Marcos García de La Fuente
2dedea8736 FIX #4016 User link is not correctly formed in emailing receivers 2015-11-20 22:03:44 +01:00
Marcos García de La Fuente
5dba9ef54e FIX #4043 Incorrect translation in error mesage in menu creation admin page 2015-11-20 22:00:11 +01:00
Drosis Nikos
ee4eb13fff Update functions2.lib.php 2015-11-20 19:05:00 +02:00
arnaud
07226d32ec FIX NB task and percent progress in box project 2015-11-20 16:11:48 +01:00
Florian HENRY
b8af7625ff fix new extrafields feature 2015-11-20 15:29:31 +01:00
Florian HENRY
87c9132a6d avoid error 2015-11-20 13:59:58 +01:00
Florian HENRY
101b45e397 Continue extrafeild $ID$ and select feature 2015-11-20 13:52:47 +01:00
Florian HENRY
b8cab9f4d9 continue extrafeild $ID$ and SELECT feature 2015-11-20 13:51:57 +01:00
Florian HENRY
4ff0c22e29 continue extrafield ID filter 2015-11-20 13:22:45 +01:00
Florian HENRY
eac28076c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-20 11:59:39 +01:00
Florian HENRY
1566be35a1 NEW : add $ID$ into extrafields management to allow use current object
id on filter for select list from table and checkbox list from table
2015-11-20 11:59:28 +01:00
arnaud
4233d24f4b FIX export with category contact extrafields 2015-11-19 18:01:58 +01:00
Frédéric FRANCE
47485b39ce Update commande.class.php 2015-11-19 16:41:11 +01:00
Florian HENRY
80f19de223 fix && vs and 2015-11-19 16:32:25 +01:00
Frédéric FRANCE
6c8ac1e95c typo 2015-11-19 16:31:55 +01:00
Frédéric FRANCE
3a2cb63575 Update list.php 2015-11-19 16:20:06 +01:00
Maxime Kohlhaas
9c1545bc1b NEW add info page on product card 2015-11-19 14:45:05 +01:00
Maxime Kohlhaas
826592c480 Fix info and banner on societe 2015-11-19 14:43:00 +01:00
Maxime Kohlhaas
e4125c9802 NEW : info function for product card 2015-11-19 14:26:32 +01:00
philippe grand
4f280f63d0 [Qual] Uniformize code 2015-11-19 13:59:58 +01:00
Florian HENRY
0c4f7a1b22 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-19 12:55:20 +01:00
aspangaro
98d5f21787 Debug state 2015-11-19 06:21:37 +01:00
Juanjo Menent
a627e32fca Merge pull request #4034 from fmarcet/3.7
FIX Not use localtaxes when invoice some orders
2015-11-18 23:07:24 +01:00
Juanjo Menent
3094f9ed32 Merge pull request #4032 from grandoc/develop
[Qual] Uniformize code
2015-11-18 23:05:04 +01:00
Juanjo Menent
5218501c04 Merge pull request #4024 from defrance/patch-81
bad limittoshow usage
2015-11-18 22:31:57 +01:00
Juanjo Menent
9ecdfa8be8 Merge pull request #4017 from apachler/develop
added Regions, Departements and Forme Juridique for Austria
2015-11-18 22:04:19 +01:00
Frédéric FRANCE
dfdc220c6b Update list.php 2015-11-18 18:16:03 +01:00
Frédéric FRANCE
c647ad6425 Update list.php 2015-11-18 18:15:02 +01:00
Frédéric FRANCE
fe7cc95efd Update list.php 2015-11-18 18:13:19 +01:00
fmarcet
f615927d24 FIX Not use localtaxes when invoice some orders 2015-11-18 17:56:04 +01:00
arnaud
85a58f666a FIX product link in project box 2015-11-18 17:22:53 +01:00
philippe grand
42ed3d2bb7 [Qual] Uniformize code 2015-11-18 16:05:41 +01:00
Florian HENRY
fbe8a181a9 fix pgsql 2015-11-18 14:03:25 +01:00
fmarcet
0cbf8ca1dd FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO
variable is empty or not
2015-11-18 13:59:25 +01:00
Laurent Destailleur
735c7b7d68 Code comment 2015-11-18 13:57:01 +01:00
Florian HENRY
0ffc2a226c fix pg migration script 2015-11-18 13:53:04 +01:00
Laurent Destailleur
fbd1d2360f Comment 2015-11-18 13:42:38 +01:00
Laurent Destailleur
5c6f7425f1 FIX: List of user to assign a task is not visible 2015-11-18 13:23:01 +01:00
Florian HENRY
28196a5fd9 add pgsql function 2015-11-18 12:24:52 +01:00
aspangaro
1e4d8ec104 New: HRM #3699 Add address informations in user card 2015-11-18 06:34:08 +01:00
aspangaro
ad457b416d Use menu & add mode 'employee' in user/index.php 2015-11-17 22:51:34 +01:00
aspangaro
96d97657fd Remove obsolete code 2015-11-17 22:17:18 +01:00
aspangaro
258ac45519 Remove obsolete code 2015-11-17 22:14:39 +01:00
aspangaro
1f9960d1bb Remove info on employee card 2015-11-17 21:25:07 +01:00
aspangaro
c7df6c15a2 Different display if employee mode 2015-11-17 21:22:45 +01:00
aspangaro
b7b25c9682 Remove some code 2015-11-17 21:04:11 +01:00
aspangaro
a5ca6cb732 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-17 20:34:37 +01:00
Nikos Drosis
5082b1cc66 Fix for utf-8 characters in the mask mercure 2015-11-17 20:22:27 +02:00
Laurent Destailleur
683ad24ece Take number of entry into top menu to defined the trigger to change size
of top menu thumbs
2015-11-17 19:16:40 +01:00
Laurent Destailleur
b1c5768de9 NEW Add fields into llx_cronjobs to be able to use job table to queue
one shot jobs.
2015-11-17 18:22:39 +01:00
BENKE Charlie
ce367bfa31 bad limittoshow usage
the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector
2015-11-17 14:42:34 +01:00
Laurent Destailleur
6dc6bab556 Support of 'small', 'mini' and '' image size everywhere. 2015-11-17 10:38:00 +01:00
Laurent Destailleur
86db029cb3 Merge pull request #4013 from fappels/develop
Fix migration - remove default for text field
2015-11-17 10:06:07 +01:00
BENKE Charlie
4aad7122e0 add odt feature on supplier admin page
add odt feature on supplier admin page
2015-11-17 10:06:03 +01:00
BENKE Charlie
8630a2d56b add odt feature on supplier admin page
add odt feature on admin page
2015-11-17 10:04:13 +01:00
Andreas Pachler
161b75acfc added Regions, Departements and Forme Juridique for Austria 2015-11-17 06:56:49 +01:00
Laurent Destailleur
c6e7413349 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-17 00:58:22 +01:00
Laurent Destailleur
f5631cac45 NEW Introduce property module_position so a module can decide where it
appears into list of modules.
2015-11-17 00:58:12 +01:00
Paris Liakos
fb6819764d Add PRODUCT_DEL_MULTILANGS trigger for translation deletion on product 2015-11-17 01:20:58 +02:00
Laurent Destailleur
a8bfa1a258 Merge pull request #4011 from ParisLiakos/develop
Add triggers for product and category translation changes
2015-11-16 23:50:18 +01:00
Laurent Destailleur
508b11733a Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name
FIX 3.8 allow to search on alias name into select
2015-11-16 23:48:18 +01:00
Laurent Destailleur
2f1a1c5111 Merge pull request #4008 from atm-ph/fix_38_trigger_propal_clone
FIX can not have access to the new ids or propal lines on PROPAL_CLONE
2015-11-16 23:46:03 +01:00
Laurent Destailleur
835700bb25 Merge pull request #4006 from marcosgdf/bug-3989
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 23:42:38 +01:00
Laurent Destailleur
04ffe1c7f0 Merge pull request #4005 from marcosgdf/bug-3988
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 23:42:04 +01:00
Laurent Destailleur
76eeb0d2f1 Merge pull request #4004 from marcosgdf/bug-3992
FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be
2015-11-16 23:41:46 +01:00
Laurent Destailleur
0e511027f6 Merge pull request #4003 from marcosgdf/bug-3996
FIX #3996 Dictionnary hooks are not working in 3.8
2015-11-16 23:41:06 +01:00
Laurent Destailleur
9693982f27 Merge pull request #4002 from marcosgdf/bug-3997
FIX #3997 Wrong permission key used for Margins > Read all
2015-11-16 23:40:47 +01:00
Laurent Destailleur
dbf384ec6b Merge pull request #4000 from fmarcet/develop_bolivia
New: Bolivian regions and departments
2015-11-16 23:40:16 +01:00
Laurent Destailleur
d16efbaf24 Merge pull request #3999 from fmarcet/3.8
FIX: Can't update line's duration
2015-11-16 23:39:44 +01:00
Laurent Destailleur
66f24ff400 Merge pull request #3983 from grandoc/develop
[Qual] Uniformize code
2015-11-16 23:31:40 +01:00
Laurent Destailleur
2fbb030d61 Merge pull request #3984 from frederic34/warehouse
Select warehouse on order card
2015-11-16 23:31:25 +01:00
Laurent Destailleur
de70321149 Merge pull request #3982 from frederic34/imgstatut
Add statut2 icon and adjust some other
2015-11-16 23:30:49 +01:00
Frédéric FRANCE
59dd1502de Update list.php 2015-11-16 21:29:39 +01:00
fappels
e9be3d19f4 Fix migration - remove default for text field
remove default for user_param value text field
lang typo
2015-11-16 21:24:08 +01:00
Paris Liakos
146aa7815b Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories 2015-11-16 20:27:51 +02:00
Alexis Algoud
a7d2bdc2c1 FIX 3.8 allow to search on alias name into select 2015-11-16 19:10:20 +01:00
Frédéric FRANCE
0424a2bb3d Update list.php 2015-11-16 16:27:37 +01:00
phf
c21354101f FIX can not have access to the new ids or propal lines on PROPAL_CLONE 2015-11-16 15:36:02 +01:00
Alexis Algoud
55b23c4918 FIX add billed field in supplier order 2015-11-16 14:55:46 +01:00
Marcos García de La Fuente
53fb085766 Corrected indent 2015-11-16 13:29:37 +01:00
Marcos García de La Fuente
ec7e4cb3d4 FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl 2015-11-16 13:25:00 +01:00
Marcos García de La Fuente
0880b13142 FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline 2015-11-16 13:24:11 +01:00
Marcos García de La Fuente
be460b6cbf FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be 2015-11-16 13:20:56 +01:00
Marcos García de La Fuente
8e9e2911ae FIX #3996 Dictionnary hooks are not working in 3.8 2015-11-16 13:18:25 +01:00
Marcos García de La Fuente
73da011461 FIX #3997 Wrong permission key used for Margins > Read all 2015-11-16 13:16:54 +01:00
fmarcet
9e51cf66dd New: Bolivian regions and departmens 2015-11-16 12:34:59 +01:00
fmarcet
0a92849de3 FIX: Can't update line's duration 2015-11-16 10:57:47 +01:00
aspangaro
06f752b250 Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy 2015-11-16 06:50:04 +01:00
Frédéric FRANCE
ba60313f88 Update list.php 2015-11-16 00:11:03 +01:00
Frédéric FRANCE
faff8e2cd8 Update list.php 2015-11-16 00:01:34 +01:00
Laurent Destailleur
dfc01e971f Update files for transifex sync 2015-11-15 20:27:43 +01:00
Florian HENRY
c3b7bbfb3b FIX : #3990 2015-11-15 20:00:11 +01:00
Laurent Destailleur
7afedd3f8b Minor enhancement of theme MD 2015-11-15 19:29:18 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
388748055a Fix missing translation for VAT 2015-11-15 15:08:54 +01:00
frederic34
e0ee6718ad Select warehouse on order card 2015-11-15 11:42:47 +01:00
Laurent Destailleur
db941d5395 NEW Enhance style engine. Add option to set color of links 2015-11-15 11:31:09 +01:00
philippe grand
f308606ee1 [Qual] Uniformize code 2015-11-15 07:47:35 +01:00
Laurent Destailleur
192fdbdcc4 Minor look uniformization 2015-11-14 23:10:12 +01:00
Laurent Destailleur
c2ec4a4fd2 Move online help link at a better place (top right). Link is also always
visible.
2015-11-14 22:49:34 +01:00
Laurent Destailleur
6895daa5e9 Fix tr/td not correctly open/closed
Fix default value was not set
2015-11-14 19:31:50 +01:00
Laurent Destailleur
80127cbbc9 Fix tr/td not correctly open/closed
Fix default value was not set
2015-11-14 19:31:16 +01:00
Laurent Destailleur
1da53501a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-14 17:54:28 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
b4af55ab40 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-14 14:57:49 +01:00
Laurent Destailleur
b75923871c FIX: Too many information were hidden. A lot of users still need bank
account on PDF.
2015-11-14 14:56:44 +01:00
frederic34
488acfd177 Add statut2 icon and adjust some other 2015-11-14 10:50:26 +01:00
Laurent Destailleur
653fb00a0e Merge pull request #3981 from ParisLiakos/develop
getListOfProductsOrServices() filters are broken
2015-11-13 19:47:44 +01:00
Paris Liakos
298a671342 getListOfProductsOrServices() filters are broken 2015-11-13 20:25:12 +02:00
Laurent Destailleur
5b1e20494b Merge pull request #3977 from FHenry/3.8
FIX : showrefnav htmlspecialchar instead of < >
2015-11-13 19:22:41 +01:00
Laurent Destailleur
3ff42a45d4 Merge pull request #3976 from atm-alexis/3.9_FIX_htmlname_for_ajax_contact
FIX htmlname parameters wasnt applied
2015-11-13 19:22:18 +01:00
Laurent Destailleur
85c0ed39f1 Merge pull request #3974 from atm-ph/fix_38_aufocus
FIX autofocus on input search product
2015-11-13 19:21:52 +01:00
Laurent Destailleur
510e3bc4c2 Merge pull request #3975 from All-3kcis/develop-patch-12
Fix #3542
2015-11-13 19:20:24 +01:00
Florian HENRY
2a2155a239 FIX : showrefnav htmlspecialchar instead of < > 2015-11-13 14:40:52 +01:00
Laurent Destailleur
8068d01cfc Add style maxwidth150 2015-11-13 14:16:45 +01:00
Laurent Destailleur
5e67eefff3 Removed phpcs warning 2015-11-13 12:48:17 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Alexis Algoud
965de406d3 FIX htmlname parameters wasnt applied 2015-11-13 11:47:15 +01:00
Laurent Destailleur
bad28c6d92 Fi sntax error 2015-11-13 11:44:55 +01:00
Laurent Destailleur
eac80d7db4 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
2015-11-13 11:43:29 +01:00
All-3kcis
c59482fea1 Fix #3542 2015-11-13 11:17:23 +01:00
Laurent Destailleur
c7546dbad2 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-13 11:13:04 +01:00
Laurent Destailleur
b3be7f65cd Fix syntax error . = instead of .= 2015-11-13 11:12:49 +01:00
Laurent Destailleur
682842f15f Fix into title of login page, we must report the tru dolibarr version
after the @ (technical information), event if application name/version
was replaced with a constant.
2015-11-13 10:37:51 +01:00
phf
81a8933256 FIX autofocus on input search product 2015-11-13 10:36:32 +01:00
aspangaro
0f75d76296 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-13 07:52:44 +01:00
Laurent Destailleur
9a98206d5a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-13 03:36:08 +01:00
Laurent Destailleur
64c783623b NEW Framework feature. To have a page being loaded at same scrollbar
level wafter a click on a href link, just add the class "reposition" on
this link.
2015-11-13 03:35:55 +01:00
Laurent Destailleur
778941b549 Merge pull request #3948 from marcosgdf/missing-changes
Missing changes of PR #3927
2015-11-13 02:29:56 +01:00
Laurent Destailleur
7d9fde803b Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter
NEW Develop multi type event filter
2015-11-13 02:27:53 +01:00
Laurent Destailleur
471bcdd29f Remove hard coded list of permissions. 2015-11-13 02:21:27 +01:00
Laurent Destailleur
ea6fe02f18 Merge pull request #3923 from altatof/customerinfos
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
2015-11-13 00:35:39 +01:00
Laurent Destailleur
0ca9027459 Merge pull request #3973 from frederic34/patch-3
llx_accounting_account ADD INDEX account_number
2015-11-13 00:34:02 +01:00
Laurent Destailleur
e2e804e37a Minor fix 2015-11-13 00:30:10 +01:00
Laurent Destailleur
4065b3f1df Better management of the Dolibarr tracking id into email.
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Laurent Destailleur
74a4006a84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-12 21:25:30 +01:00
Laurent Destailleur
b2285ca5e0 Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Laurent Destailleur
60535086d4 Merge pull request #3965 from jpfox/patch-2
Correct pattern to match all odt var tags
2015-11-12 18:32:45 +01:00
Laurent Destailleur
816bacc37e Merge pull request #3968 from atm-arnaud/3.8_fix_export_extrafield_propal_order
FIX export propal and order with extrafields
2015-11-12 18:31:59 +01:00
Frédéric FRANCE
bab41e40e7 Update 3.8.0-3.9.0.sql 2015-11-12 17:50:52 +01:00
Frédéric FRANCE
bd7687b6ab Update llx_accounting_account.key.sql 2015-11-12 17:47:08 +01:00
Laurent Destailleur
924db5b8aa Merge pull request #3969 from FHenry/3.8
FIX : better fix for #3805
2015-11-12 15:08:34 +01:00
Laurent Destailleur
8925717bbe Merge pull request #3966 from atm-ph/fix_38_title_actioncomm
FIX mail isn't display in title on event in mode view
2015-11-12 15:07:29 +01:00
Laurent Destailleur
8a26e27ef3 Merge pull request #3967 from grandoc/develop
[Qual] Uniformize code
2015-11-12 15:01:20 +01:00
Laurent Destailleur
9a9be97c2c Add a log to help diagnose bad usage of method ad of event 2015-11-12 14:36:35 +01:00
Regis Houssin
52bd90f950 Fix: wrong var name 2015-11-12 14:12:56 +01:00
Florian HENRY
019575d9ed FIX : better fix for #3805 2015-11-12 13:21:35 +01:00
arnaud
aaa6f00d11 FIX export propal and order with extrafields 2015-11-12 12:37:04 +01:00
Laurent Destailleur
f49a33b600 Try a change for better compatibility with old search form 2015-11-12 12:22:21 +01:00
philippe grand
c712532bf6 [Qual] Uniformize code 2015-11-12 11:59:15 +01:00
phf
f041c017e9 FIX mail isn't display in title on event in mode view 2015-11-12 11:30:44 +01:00
Marcos García de La Fuente
3c42df935d Corrected HTML closing tag 2015-11-12 10:26:05 +01:00
Jean-Pierre Morfin
0cb9cc2213 Correct pattern to match all odt var tags
some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax
2015-11-12 09:24:04 +01:00
Alexis Algoud
d997ac83e7 Add function param description 2015-11-12 09:08:08 +01:00
Alexis Algoud
a2c8c7c20e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter 2015-11-12 09:05:26 +01:00
aspangaro
30c4f1c896 HRM : language 2015-11-12 07:40:46 +01:00
aspangaro
bedba7ffb7 HRM: add a mode 'employee' for development to show tab 2015-11-12 07:26:51 +01:00
aspangaro
154f88a58c HRM: Copy info from user 2015-11-12 07:24:52 +01:00
aspangaro
7693b407e8 HRM: Begin to work on employee card 2015-11-12 06:59:40 +01:00
aspangaro
20872498ba HRM: Add a tab for holiday module in employee card 2015-11-12 06:58:26 +01:00
aspangaro
4ce6287d52 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-12 05:51:12 +01:00
aspangaro
f602e1fba7 HRM : Add an email address in admin to prevent HRM external service (public accountant for exemple) 2015-11-12 05:48:56 +01:00
Laurent Destailleur
2bd0f04d8f Add feature to get nb of top menu entrie
Fix translation of units
2015-11-12 00:48:37 +01:00
Laurent Destailleur
1f4742b77b Remove useles html generated code. More code comment. 2015-11-11 19:38:19 +01:00
Laurent Destailleur
cb29f91434 FIX An external libray must contains also non obfuscated code into
source
2015-11-11 19:11:43 +01:00
Laurent Destailleur
327d764284 Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr
into GPCsolutions-dolibarr-php7

Conflicts:
	.gitignore
2015-11-11 19:03:36 +01:00
Laurent Destailleur
9ee06e8f0d Merge pull request #3951 from frederic34/fccard
add messages
2015-11-11 18:32:30 +01:00
Laurent Destailleur
f6a9597507 Merge pull request #3959 from aspangaro/develop-hrm
HRM: Correct getNomUrl
2015-11-11 18:32:14 +01:00
Laurent Destailleur
ca62689a96 Merge pull request #3961 from frederic34/escpos
Escpos : install lib with composer
2015-11-11 18:30:57 +01:00
frederic34
954291ae0b re-add library escpos 2015-11-11 18:02:47 +01:00
frederic34
765e83d456 delete directory 2015-11-11 18:01:13 +01:00
frederic34
cd738ef483 Merge remote branch 'upstream/develop' into fccard
Conflicts:
	htdocs/commande/card.php
2015-11-11 17:23:37 +01:00
frederic34
01d4bd6cf5 bad invert 2015-11-11 17:19:53 +01:00
Laurent Destailleur
21ca7dc823 Merge pull request #3960 from aspangaro/develop-hrm2
HRM: Add fk_establishment in llx_user to link an user to an establish…
2015-11-11 17:08:42 +01:00
Laurent Destailleur
59a79442b0 Enhance code for select field list feature.
Add gender and employee on user list.
2015-11-11 17:05:18 +01:00
Laurent Destailleur
4ddfa6e1b5 Merge pull request #3956 from frederic34/patch-3
Update product.php
2015-11-11 15:51:09 +01:00
Laurent Destailleur
a0606cece9 Merge pull request #3955 from grandoc/develop
[Qual] Uniformize code
2015-11-11 15:50:48 +01:00
Christophe Battarel
cc35f2b738 Merge branch 'develop' into customerinfos 2015-11-11 15:46:22 +01:00
aspangaro
05b0ab2eab HRM: Add fk_establishment in llx_user to link an user to an establishment 2015-11-11 15:45:55 +01:00
aspangaro
bbab5e5bc3 Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-11-11 15:38:52 +01:00
Laurent Destailleur
e673b18871 Merge pull request #3949 from marcosgdf/bug-3865
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
2015-11-11 15:36:34 +01:00
Christophe Battarel
0c40a6dda5 add hidden constant 2015-11-11 15:32:42 +01:00
aspangaro
54091a0661 Correct getNomUrl 2015-11-11 15:31:39 +01:00
philippe grand
12c5d02a7a [Qual] Uniformize code 2015-11-11 12:27:09 +01:00
aspangaro
e157d8b8d2 Update for fk_country 2015-11-11 08:52:28 +01:00
aspangaro
ca0c68a8e2 Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-11-11 08:20:12 +01:00
aspangaro
e1b329e80a HRM: Update work 2015-11-11 08:16:06 +01:00
Frédéric FRANCE
2799dbf45b Update product.php 2015-11-10 23:02:54 +01:00
philippe grand
d06a445e01 [Qual] Uniformize code 2015-11-10 19:22:27 +01:00
Laurent Destailleur
13a0fa2c69 Missing css 2015-11-10 15:50:13 +01:00
Laurent Destailleur
b0419557b1 Exclude dir 2015-11-10 00:37:30 +01:00
Laurent Destailleur
98c32fa1ec FIX The label hidden was not supported when using jmobile 2015-11-10 00:36:33 +01:00
Alexis Algoud
99513ac9f3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter 2015-11-09 18:31:21 +01:00
frederic34
b8a84d68ec add messages 2015-11-09 18:19:10 +01:00
Alexis Algoud
68cbd4699b NEW multi event type for filter and get form in order to allow bookmark 2015-11-09 17:18:23 +01:00
Laurent Destailleur
19684f9a36 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-09 16:48:41 +01:00
Laurent Destailleur
f49fab8a7e Rename some files in english and increase fields size. 2015-11-09 16:48:30 +01:00
Raphaël Doursenaud
c3ed30ffd8 Moved to new package for TCPDF
Previous one has been deprecated by upstream
2015-11-09 12:21:08 +01:00
Raphaël Doursenaud
e5915ce8d9 Upgraded PHPExcel to v1.8.1
Fixes issues with PHP 7
2015-11-09 12:19:48 +01:00
Raphaël Doursenaud
0e155be4e8 Reinstall ckeditor with composer
This time using the correct full package

Also used the branch + tag commit to work around that bug:
https://github.com/ckeditor/ckeditor-releases/issues/41
2015-11-09 12:18:50 +01:00
Raphaël Doursenaud
442431704b Upgraded ADOdb Date to v0.36
Extracted from ADOdb v5.19
Fixes PHP 7 fatal error
2015-11-09 12:16:04 +01:00
Raphaël Doursenaud
7c44198022 [Qual] Prevent GIT submodules in composer deps
Dependencies installed with composer should not be added as submodules.
Restored missing Escpos-php library.
2015-11-09 12:12:05 +01:00
Marcos García de La Fuente
80ef746348 Reverted unwanted changes 2015-11-08 19:23:02 +01:00
Laurent Destailleur
71fa347e8e FIX Better compatibility for users that used the not supported option
MAIN_USE_JQUERY_MULTISELECT set to 1.
2015-11-08 18:40:12 +01:00
Marcos García de La Fuente
9cdf45e0a6 Fixed JS compatibility with multiprices price generator 2015-11-08 16:54:54 +01:00
Marcos García de La Fuente
9bc4b9f0bc Moved update function after updatePrice 2015-11-08 16:45:42 +01:00
Marcos García de La Fuente
7ebe032d6f FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
Close #3865
2015-11-08 16:01:12 +01:00
Laurent Destailleur
096ec3100d Merge pull request #3926 from frederic34/fccard
allow chaining and remove header exit
2015-11-08 15:49:33 +01:00
Laurent Destailleur
6ec33a94c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-08 15:39:10 +01:00
Laurent Destailleur
bd56396394 Fix migration error 2015-11-08 15:38:57 +01:00
Marcos García de La Fuente
7f0d81d255 Missing changes of PR #3927 2015-11-08 15:12:31 +01:00
Marcos García de La Fuente
04243510f3 Little changes 2015-11-08 14:54:29 +01:00
Laurent Destailleur
e6ab6bdb8e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-08 14:38:01 +01:00
Laurent Destailleur
7a0206adce FIX Missing to set context into workflow actions, so triggers can't know
we are creating an invoice from order or an order from a proposal.
2015-11-08 14:37:50 +01:00
Juanjo Menent
0ce7cad48c Merge pull request #3946 from aspangaro/3.7-1
Fix: Accountancy compatibility with subtotal & jalon module
2015-11-08 11:26:06 +01:00
Juanjo Menent
8eb74b5bd4 Merge pull request #3945 from grandoc/develop
[Qual] Uniformize code
2015-11-08 11:25:11 +01:00
Juanjo Menent
7673a73a65 Merge pull request #3939 from marcosgdf/bug-3836
FIX #3836 Unable to upload a document to an invoice under some circunstances
2015-11-08 11:21:16 +01:00
Juanjo Menent
59b3124d7d Merge pull request #3938 from marcosgdf/fr-3876
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
2015-11-08 11:20:36 +01:00
Juanjo Menent
f15e83e918 Merge pull request #3937 from marcosgdf/bug-3877
FIX #3877 HTML encoded strings when searching for a supplier invoice
2015-11-08 11:19:49 +01:00
Juanjo Menent
509b45a0d0 Merge pull request #3936 from marcosgdf/bug-3931
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
2015-11-08 11:19:13 +01:00
Juanjo Menent
77284982d5 Merge pull request #3935 from marcosgdf/bug-3897
FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates
2015-11-08 11:18:29 +01:00
Juanjo Menent
8377d6967a Merge pull request #3934 from marcosgdf/bug-3679
FIX #3679 Error when deleting a Localtax2 special payment
2015-11-08 11:16:07 +01:00
Juanjo Menent
a6f0baefc1 Merge pull request #3933 from marcosgdf/bug-3980
FIX #3890 Expected transactions bank account page, shows negative numbers
2015-11-08 11:15:31 +01:00
Juanjo Menent
9e11289f5b Merge pull request #3927 from marcosgdf/fr-3767
NEW #3767 Allow changing multiple prices of a product at once
2015-11-08 11:13:04 +01:00
Juanjo Menent
a02100e3c7 Merge pull request #3924 from atm-gauthier/develop_fix_script_creation
FIX : wrong coma in llx_opensurvey_sondage.sql creation script
2015-11-08 11:03:26 +01:00
aspangaro
f0a3bca4c2 Fix: Accountancy compatibility with subtotal & jalon module 2015-11-08 04:22:49 +01:00
Laurent Destailleur
1d2dab63a3 More space 2015-11-08 02:32:22 +01:00
Laurent Destailleur
333dd10874 Add a way to lin on bank receipt tab directly 2015-11-08 02:09:32 +01:00
Laurent Destailleur
7a423c04d4 Fix The only default value is value we just entered 2015-11-08 02:00:28 +01:00
Laurent Destailleur
fa8863d2ea Fix sql migration requests 2015-11-08 01:38:03 +01:00
Laurent Destailleur
e350b759d3 Increase number of last bank receits visible links 2015-11-08 00:52:25 +01:00
Laurent Destailleur
24dff1d842 NEW Statistic graphs on products offer a filter on product type (product
/ service or both)
2015-11-08 00:35:30 +01:00
Laurent Destailleur
b5c9602da4 Fix Use new look for left-right arrow 2015-11-08 00:08:50 +01:00
Laurent Destailleur
031b33d582 FIX Checkbox reconciliated no correctly checked with some Chrome
versions
2015-11-07 23:54:11 +01:00
Laurent Destailleur
3906cb79c5 NEW: Add parameter to add a link to use "date of invoice" in one click
when fille a payment card.
2015-11-07 23:46:07 +01:00
philippe grand
b34edeb751 [Qual] Uniformize code 2015-11-07 21:56:21 +01:00
Florian HENRY
a4fafae109 FIX : Remove column creation for table llx_product_fournisseur_price,
the column use un calss is fk_supplier_price_expression, and
fk_price_expression does not exist into lx_product_fournisseur_price sql
file declaration
2015-11-07 17:19:13 +01:00
Laurent Destailleur
4e64230ac9 NEW Add chart of product statistics 2015-11-07 16:25:14 +01:00
Laurent Destailleur
57e162d7f8 The component selectAjaxArray can return javascript part into a global
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
2015-11-07 15:46:06 +01:00
Marcos García de La Fuente
4a52d3c1b1 Removed unwanted change 2015-11-07 15:35:00 +01:00
Marcos García de La Fuente
84a152dc2e FIX #3836 Unable to upload a document to an invoice under some circunstances 2015-11-07 15:33:48 +01:00
Marcos García de La Fuente
75b4cb4727 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2 2015-11-07 14:37:47 +01:00
Marcos García de La Fuente
ba42a7779f FIX #3877 HTML encoded strings when searching for a supplier invoice
Close #3877
2015-11-07 14:34:26 +01:00
Marcos García de La Fuente
0451cc1e73 FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
Close #3931
2015-11-07 14:31:12 +01:00
Marcos García de La Fuente
8ccb8c92e0 FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates
Close #3897
2015-11-07 14:29:38 +01:00
Marcos García de La Fuente
01854b3259 FIX #3679 Error when deleting a Localtax2 special payment 2015-11-07 13:51:09 +01:00
Marcos García de La Fuente
728f469c1e FIX #3890 Expected transactions bank account page, shows negative numbers 2015-11-07 13:43:59 +01:00
Marcos García de La Fuente
3bbedf1795 FIX #3707 Thirdparty bank account page table has a glitch 2015-11-07 13:39:34 +01:00
Laurent Destailleur
c0872d690e Use new banner for other tabs of product 2015-11-07 13:32:14 +01:00
Marcos García de La Fuente
b4c3804c91 FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card 2015-11-07 13:21:03 +01:00
Laurent Destailleur
439e4a483d Doc comment 2015-11-07 12:37:05 +01:00
Laurent Destailleur
350ef610e9 Fix beluga pdf for projects. Add missing expense reports. 2015-11-07 12:36:34 +01:00
Marcos García de La Fuente
45b4122a95 NEW #3767 Allow changing multiple prices of a product at once 2015-11-07 12:29:51 +01:00
Laurent Destailleur
99f5211070 NEW Can use the * as a joker characters into search boxes of lists 2015-11-07 11:48:35 +01:00
Laurent Destailleur
09fb87e47d Prepare tables for categories/tags on projects. Looking for a dev to
implement categories/tags on projects !
2015-11-07 11:40:31 +01:00
frederic34
7349862b64 translations 2015-11-07 11:19:31 +01:00
frederic34
a597d6c379 allow chaining 2015-11-07 10:23:56 +01:00
frederic34
becce332dd allow chaining and remove header exit 2015-11-07 09:52:00 +01:00
Laurent Destailleur
e7554d377f Fix better error message 2015-11-06 19:07:05 +01:00
Laurent Destailleur
b2d9f21253 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-06 18:57:46 +01:00
Laurent Destailleur
d0e6db7f89 Use the new banner for first tab of products. 2015-11-06 18:57:35 +01:00
Gauthier
ef3c7f927e FIX : wrong coma in llx_opensurvey_sondage.sql creation script 2015-11-06 16:38:26 +01:00
Christophe Battarel
f52ae35dc6 NEW FEATURE PROPOSAL: on propale, order or invoice creation from
scratch, reload page after customer selection so its informations can be
loaded
2015-11-06 16:14:00 +01:00
Laurent Destailleur
9cb2d046d0 Merge pull request #3919 from marcosgdf/bug-3914
FIX #3194 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared
2015-11-06 12:32:26 +01:00
Laurent Destailleur
fdd93554ce Merge pull request #3921 from marcosgdf/fr-3898
NEW #3898 Remove deprecated Product::hidden property
2015-11-06 12:31:44 +01:00
Laurent Destailleur
b723ca7d16 Merge pull request #3920 from marcosgdf/fr-3768
NEW Deprecated Product::setPriceExpression. Use Product::update instead
2015-11-06 12:30:57 +01:00
Laurent Destailleur
2c4b0c0d24 Merge pull request #3918 from FHenry/develop
FIX: #3913
2015-11-06 12:20:22 +01:00
Marcos García de La Fuente
ac8bee28ef NEW #3898 Remove deprecated Product::hidden property
Close #3898
2015-11-06 11:40:22 +01:00
Marcos García de La Fuente
9969179267 NEW Deprecated Product::setPriceExpression. Use Product::update instead 2015-11-06 11:35:39 +01:00
Laurent Destailleur
bef4dd2bae Merge pull request #3917 from atm-maxime/develop
Fix : finally, autofocus on product search field is a bad idea...
2015-11-06 11:27:37 +01:00
Marcos García de La Fuente
610ef2359d FIX #3914 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared
Close #3914
2015-11-06 11:26:06 +01:00
Florian HENRY
28b229c83a FIX: #3916 2015-11-06 11:24:52 +01:00
Laurent Destailleur
11f0cad2ab FIX #3912 2015-11-06 11:22:50 +01:00
Florian HENRY
d3d62f7db5 FIX: #3913 2015-11-06 11:11:23 +01:00
Maxime Kohlhaas
dac0a7bc50 Fix : finally, autofocus on product search field is a bad idea 2015-11-06 11:09:54 +01:00
Marcos García de La Fuente
f62d6d1950 FIX Product::updatePrice() now sets new prices to Product::multiprices_* arrays 2015-11-06 11:08:41 +01:00
Florian HENRY
b0be2b04c7 FIX : #3912 2015-11-06 10:53:33 +01:00
Florian HENRY
f6b8c3a130 FIX : #3912 2015-11-06 10:50:08 +01:00
Florian HENRY
121d2beb80 fix spacing 2015-11-06 10:34:18 +01:00
Florian HENRY
f220f584ce Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-06 10:31:03 +01:00
Florian HENRY
126b5d6eca FIX : only active customer should be available into select list
thirdparty on invoice creation
2015-11-06 10:19:10 +01:00
Juanjo Menent
f33157033c Merge pull request #3909 from altatof/fixcloseshipping
FIX: change object statut on close shipping and remove erratic db commit
2015-11-06 10:16:00 +01:00
Christophe Battarel
4d11205a01 FIX: change object statut on close shipping and remove erratic db commit 2015-11-06 09:51:33 +01:00
Florian HENRY
600dbced7e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-06 09:49:48 +01:00
Florian HENRY
8d829dca32 FIX : only active customer should be return into new invoice creation
select list
2015-11-06 09:49:02 +01:00
philippe grand
5f74a0f1c0 Traduction 2015-11-06 09:46:18 +01:00
philippe grand
67c9db6a51 [Qual] Uniformize code 2015-11-06 09:36:16 +01:00
Juanjo Menent
75c0331b38 Merge pull request #3907 from olsesacl/develop-fix
Maintain origin_id and origin for copy document
2015-11-06 09:15:36 +01:00
Sergio Sanchis Climent
6bf8b7f328 Default value origin_id and origin 2015-11-06 02:25:51 +01:00
Laurent Destailleur
f9d0c887ae NEW Add a refresh button on page list of direct print jobs. 2015-11-06 02:20:42 +01:00
Sergio Sanchis Climent
6b01db5960 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-11-06 02:08:55 +01:00
Laurent Destailleur
e78ebf041a Fix deprecated code not working in jcrop. $.browser.msie and $.browser
is no more available in jquery 1.9+.
2015-11-06 02:03:41 +01:00
Laurent Destailleur
0f358eea49 Fix path definition of thumbs with the new function 2015-11-06 01:56:56 +01:00
Sergio Sanchis Climent
de8e7107ee Maintain origin_id and origin for copy document
Fix any errors.
2015-11-06 01:53:20 +01:00
Laurent Destailleur
2dc644da30 Debug Direct print module using the OAuth setup. 2015-11-06 01:33:49 +01:00
Laurent Destailleur
80ec28f9c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-05 22:20:40 +01:00
Laurent Destailleur
0433f20354 Code comment 2015-11-05 22:20:31 +01:00
Laurent Destailleur
c673b1c0c8 Merge pull request #3905 from GPCsolutions/develop-3893
Fix missing category selector
2015-11-05 22:14:38 +01:00
Laurent Destailleur
04664c203d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
2015-11-05 22:13:08 +01:00
Laurent Destailleur
58cac2d895 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/product/stock/fiche.php
	htdocs/product/stock/valo.php
2015-11-05 22:04:18 +01:00
Laurent Destailleur
e4bd99aaf3 Merge pull request #3904 from frederic34/printgcp
Google Cloud Print
2015-11-05 21:57:08 +01:00
Laurent Destailleur
a7cea65710 Merge pull request #3903 from atm-alexis/3.9_FIX_crabe_model_for_ISO_address_emplacement
NEW add an option to use standard ISO location for bill in crabe model
2015-11-05 21:51:38 +01:00
Laurent Destailleur
5777c16b72 Merge pull request #3902 from altatof/clonedorderdate
FIX: change order date on clone (as everywhere else)
2015-11-05 21:49:50 +01:00
Laurent Destailleur
fdf9617e42 Merge pull request #3900 from GPCsolutions/dolibarr-3864
Fix #3864 Really fixed invalid jQuery code
2015-11-05 21:47:40 +01:00
Laurent Destailleur
64fb4a30bb Merge pull request #3899 from grandoc/develop
Typo
2015-11-05 21:46:33 +01:00
Laurent Destailleur
6948c65a13 Merge pull request #3895 from marcosgdf/fix-bug-pricerules
Fixed feature malfunction caused by a commit and previous changes
2015-11-05 21:46:17 +01:00
Laurent Destailleur
d499fafdb9 Merge pull request #3901 from altatof/3.6
FIX bad calculation for stock value
2015-11-05 21:44:21 +01:00
Laurent Destailleur
5860491b14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2015-11-05 21:33:54 +01:00
Laurent Destailleur
f3b8df3ea5 Merge pull request #3889 from frederic34/escpos
Receipt Printer conf and lang
2015-11-05 21:32:43 +01:00
frederic34
55dfa4859f Install lib with composer 2015-11-05 21:09:14 +01:00
Raphaël Doursenaud
89411541b3 Fix missing category selector
Complement to #3893
2015-11-05 18:49:39 +01:00
frederic34
3ef6a92bb1 Google Cloud Print 2015-11-05 18:04:00 +01:00
Christophe Battarel
316b7453e4 FIX bad stock valo 2015-11-05 17:04:08 +01:00
Christophe Battarel
80d2445540 FIX: bad stock valorisation 2015-11-05 17:00:22 +01:00
frederic34
8a765bf5fd wip 2015-11-05 16:20:35 +01:00
Alexis Algoud
8221817087 NEW add an option to use standard ISO location for bill in crabe model
For electronic sending solutions, it could be required
2015-11-05 16:17:09 +01:00
Christophe Battarel
ad82135879 FIX: change order date on clone (as everywhere else) 2015-11-05 15:36:13 +01:00
Christophe Battarel
75bcb7e53f fix pmp 2015-11-05 15:32:56 +01:00
Christophe Battarel
f566b38296 FIX pmp 2015-11-05 15:29:51 +01:00
Christophe Battarel
fa088eb6cc FIX bad calculation for stock value 2015-11-05 14:57:58 +01:00
Raphaël Doursenaud
b0cf9bd0be Fix #3864 Really fixed invalid jQuery code 2015-11-05 14:38:11 +01:00
philippe grand
04238da75d Typo 2015-11-05 14:16:13 +01:00
Laurent Destailleur
1927f47eaa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-05 13:43:33 +01:00
Laurent Destailleur
d2fa580f5d The code generator can generate a list.php page with all feature
immediatly working (sort, extrafields, hooks, select fields to show...)
2015-11-05 13:43:22 +01:00
Marcos García de La Fuente
e64057c276 Removed unnecesary attribute 2015-11-05 13:07:44 +01:00
Marcos García de La Fuente
6e8a6eca7a Fixed feature malfunction caused by commit a161e6d47a and previous changes 2015-11-05 13:06:14 +01:00
Christophe Battarel
9b797c1831 FIX bad calculation for stock value 2015-11-05 12:49:43 +01:00
fmarcet
015dedc3ab FIX: Show category selector if we have permission to view products or
services
2015-11-05 11:53:45 +01:00
Alexis Algoud
e1ea2215a3 FIX loss data also if update was cancel by error of ended state with no end date, try a generic patch 2015-11-05 11:25:04 +01:00
philippe grand
b9c0cd316f [Qual] Fix : TODO:translate 2015-11-05 11:11:51 +01:00
Alexis Algoud
0543a31920 FIX event's data lost on user assign update 2015-11-05 11:11:03 +01:00
Laurent Destailleur
41ccfc411a Better error message 2015-11-05 10:11:39 +01:00
frederic34
1a374ddd2c Receipt Printer conf and lang 2015-11-05 08:42:03 +01:00
Laurent Destailleur
fa413fea76 FIX #3813 2015-11-05 03:12:57 +01:00
Laurent Destailleur
f319976e5d FIX #3878 Storing and deleting files on emailing was done at wrong place
Conflicts:
	htdocs/comm/mailing/card.php
2015-11-05 03:08:15 +01:00
Laurent Destailleur
a612289136 FIX Storing and deleting files on emailing was done at wrong place 2015-11-05 03:02:31 +01:00
Laurent Destailleur
1f4481a6b0 Merge pull request #3172 from atm-maxime/new_creditnote
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
2015-11-05 02:45:15 +01:00
Laurent Destailleur
7a5a5459cd Merge pull request #3888 from olsesacl/develop-hook-origin
When you create a "commande" from a "propal" lost $object->origin and  $object->origin_id in hook
2015-11-05 02:39:22 +01:00
Laurent Destailleur
14ec86047f Merge pull request #3886 from GPCsolutions/dolibarr-3805
Fix #3805 Enhanced Facture::is_last_in_cycle()
2015-11-05 02:33:48 +01:00
Laurent Destailleur
e12c8fea79 Merge pull request #3885 from GPCsolutions/dolibarr-3870
Fix #3870 Missing translation
2015-11-05 02:32:48 +01:00
Laurent Destailleur
4bb21fd218 Merge pull request #3884 from FHenry/3.8
FIX #3880
2015-11-05 02:32:32 +01:00
Laurent Destailleur
11b7d8a44c Merge pull request #3873 from frederic34/escpos
Escpos Receipt printer
2015-11-05 02:18:09 +01:00
Laurent Destailleur
bd96d2f5b1 Merge pull request #3869 from atm-alexis/3.9_FIX_hook_for_PDF
FIX all PDF hook must be in addreplace type
2015-11-05 02:16:49 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
2015-11-05 01:50:30 +01:00
Laurent Destailleur
f3421bcf6d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-05 01:13:23 +01:00
Laurent Destailleur
77371af35a FIX #3661 Margin is not selected correctly when adding a product 2015-11-05 01:08:30 +01:00
Sergio Sanchis Climent
f6991dd3ec Moving new fields at the end 2015-11-04 23:18:28 +01:00
frederic34
644a104d5f start to parse template 2015-11-04 23:14:50 +01:00
Raphaël Doursenaud
69ac75bef8 Fix #3864 Fixed invalid jQuery code 2015-11-04 22:55:14 +01:00
Sergio Sanchis Climent
eba0fa1b96 When you create an "commande" from a "propal" lost $object->origin and $object->origin_id in hook 2015-11-04 22:38:45 +01:00
aspangaro
337643e53e Accountancy : Correct errors of display in bank journal 2015-11-04 22:31:24 +01:00
Raphaël Doursenaud
c534f5bcd5 Fix #3805 Enhanced Facture::is_last_in_cycle() 2015-11-04 20:35:20 +01:00
frederic34
ece9f68e0c wip 2015-11-04 20:02:04 +01:00
Raphaël Doursenaud
23a5c303dd Fix #3870 Missing translation 2015-11-04 19:56:12 +01:00
Florian HENRY
876ab4bb59 FIX : #3882 2015-11-04 18:30:09 +01:00
Florian HENRY
c0136daeb5 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-04 18:24:22 +01:00
Florian HENRY
d4ee183662 FIX : 3880 2015-11-04 18:21:59 +01:00
Laurent Destailleur
a7795f25fc Fix Must make a difference between a buying/cost price == '' (not
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
2015-11-04 17:51:15 +01:00
Laurent Destailleur
09f3cd6f1d Fix class cant be abstract 2015-11-04 16:43:24 +01:00
Laurent Destailleur
f15425be52 Include the link "Back to list" on banner of all user tabs. 2015-11-04 15:45:35 +01:00
Laurent Destailleur
6a9342f5a3 Move default application name into one place (as a constant) 2015-11-04 14:54:17 +01:00
Laurent Destailleur
3726b127a1 Remove duplicated code or useless code 2015-11-04 14:44:11 +01:00
Laurent Destailleur
81f0b516b9 Prepare module opensurvey for 'Form' type. 2015-11-04 11:08:46 +01:00
Laurent Destailleur
826cc6db1b Repair old deprecated data 2015-11-04 09:54:13 +01:00
frederic34
614f9c8e98 wip 2015-11-03 23:26:07 +01:00
frederic34
4a67a94704 wip template edit 2015-11-03 23:11:04 +01:00
frederic34
5c725aceb8 sql 2015-11-03 22:12:03 +01:00
frederic34
d362d889f6 wip 2015-11-03 20:50:01 +01:00
Laurent Destailleur
d5b77bdc5f Fix parameters are set at a better place 2015-11-03 19:51:07 +01:00
Laurent Destailleur
0d4c5c4452 Fix missing $db->jdate 2015-11-03 15:33:45 +01:00
Laurent Destailleur
3ba194f638 NEW Can select fields to show into the contact list 2015-11-03 15:32:16 +01:00
Alexis Algoud
e3a42a78f2 FIX all PDF hook must be in addreplace type, not return value to work as expected 2015-11-03 15:14:42 +01:00
Laurent Destailleur
df4f09e72f FIX #3240 2015-11-03 14:02:36 +01:00
Laurent Destailleur
74be7bf334 FIX Filter in customer price per product of a thirdparty returned error 2015-11-03 11:40:06 +01:00
Laurent Destailleur
ea0bf44670 The ckecksum file should not be into sources. Only into packages. 2015-11-03 09:43:39 +01:00
Laurent Destailleur
12e11da6b4 Use better field 2015-11-02 21:44:52 +01:00
Laurent Destailleur
cd68ea9d0f Fix: We must use external URL for OAuth. 2015-11-02 21:42:11 +01:00
Laurent Destailleur
1bcda200e3 A module to setup OAuth. OK, but what to do once setup of a client
id/secret is done ?
2015-11-02 20:48:27 +01:00
Laurent Destailleur
563a020595 NEW Free text for cheque deposit receipt can be HTML content. 2015-11-02 20:35:33 +01:00
Laurent Destailleur
ffe1284a85 Merge pull request #3840 from frederic34/printgcp
Printing with Google Cloud Print
2015-11-02 20:09:13 +01:00
Frédéric FRANCE
e7ced32245 Fix Can't edit DictionaryRevenueStamp 2015-11-02 20:08:33 +01:00
Laurent Destailleur
7b3828b68f Merge pull request #3861 from frederic34/patch-7
Fix Can't edit DictionaryRevenueStamp
2015-11-02 20:07:09 +01:00
Laurent Destailleur
b8ffa56497 Fix #3857 2015-11-02 19:49:00 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
d8796e4cc7 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/product/stats/commande.php
	htdocs/product/stats/commande_fournisseur.php
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
	htdocs/product/stats/propal.php
2015-11-02 19:25:51 +01:00
Laurent Destailleur
958c3851d7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-02 19:17:32 +01:00
Laurent Destailleur
055fe5e275 FIX #3786 Translation of select box. 2015-11-02 19:17:22 +01:00
Frédéric FRANCE
ccb69d313c Fix Can't edit DictionaryRevenueStamp 2015-11-02 18:18:00 +01:00
Laurent Destailleur
bb26e1c195 Merge pull request #3860 from frederic34/patch-5
Update resource.lang
2015-11-02 18:06:31 +01:00
Laurent Destailleur
67a2f6ee91 Merge pull request #3854 from fmarcet/3.8
FIX: Send emails to contacts who should not receive emails
2015-11-02 18:03:59 +01:00
Laurent Destailleur
2dab183240 Merge pull request #3858 from fappels/3.8
Fix always first warehouse in stock list lotserial
2015-11-02 17:59:33 +01:00
Laurent Destailleur
f928062e2b FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO 2015-11-02 17:56:32 +01:00
Frédéric FRANCE
76c89884ba Update resource.lang 2015-11-02 17:32:02 +01:00
Frédéric FRANCE
ebf6493987 Typo 2015-11-02 17:31:03 +01:00
fappels
d714d32424 Fix always first warehouse in reassortlot 2015-11-02 16:37:51 +01:00
Laurent Destailleur
3ba97627ff FIX Default thirdparty when cloning invoice was not set. 2015-11-02 15:50:03 +01:00
Laurent Destailleur
85af140420 More complete example of odt template for invoices 2015-11-02 15:46:27 +01:00
Laurent Destailleur
e12a38d584 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-02 15:44:57 +01:00
Laurent Destailleur
d0d4c5e7f8 NEW The conditional IF into ODT templates works also on not defined var
so we can show data only if defined. Close #3819
2015-11-02 15:44:47 +01:00
Laurent Destailleur
c06c2d0464 FIX #3841 creation of a task completed has not status set to finished by
default
2015-11-02 14:21:45 +01:00
Frédéric FRANCE
7b8a33adfe Update commonobject.class.php 2015-11-02 13:20:51 +01:00
Laurent Destailleur
c119859696 NEW The quick search box on left menu can also search into expense
reports.
2015-11-02 13:14:46 +01:00
fmarcet
3c5903f75a FIX: Contacts are not added to the list with the status "no contact" 2015-11-02 11:52:58 +01:00
fmarcet
ba4f306c83 FIX: Avoid changing the state to a thirdparty who shouldn't be
contacted anymore
2015-11-02 11:52:58 +01:00
Laurent Destailleur
269fb87342 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-02 11:46:12 +01:00
Laurent Destailleur
20a1863866 FIX IF autocomplete was set on thirdparty list, it was not possible to
open list of extrafields.
2015-11-02 11:45:59 +01:00
frederic34
9149032a03 Merge remote branch 'upstream/develop' into printgcp
Conflicts:
	htdocs/core/actions_printing.inc.php
2015-11-02 11:43:34 +01:00
Laurent Destailleur
250be086b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-02 11:36:39 +01:00
Laurent Destailleur
1ee9594e38 Merge pull request #3846 from frederic34/patch-21
Correction double translation which give bad html display
2015-11-02 11:29:04 +01:00
Laurent Destailleur
a9ddcc1a80 Merge pull request #3832 from frederic34/patch-16
NEW Add supplier order to the Direct Printing System
2015-11-02 11:27:00 +01:00
Laurent Destailleur
a14fee7296 Merge pull request #3852 from hregis/develop_origin
FIX add Mac OS detection and show it into OS information of user popup
2015-11-02 11:26:20 +01:00
Laurent Destailleur
72915aa16d Merge pull request #3784 from All-3kcis/develop-patch-11
NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"
2015-11-02 11:23:49 +01:00
Laurent Destailleur
bc29898621 Merge pull request #3814 from FHenry/3.8
FIX : missing tag myuser_job into ODT replacement
2015-11-02 11:22:52 +01:00
Laurent Destailleur
4cddb0175b Merge pull request #3575 from atm-ph/fix_3.8_clone_order
FIX clone customer order
2015-11-02 11:21:52 +01:00
Laurent Destailleur
1a0179dd1f More complete help 2015-11-02 11:08:36 +01:00
Laurent Destailleur
200e4638f4 Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
Fix: #2591 Margin is incorrect used with POS
2015-11-02 11:06:20 +01:00
Laurent Destailleur
465ad6b3a7 Merge pull request #3802 from olsesacl/develop-hook
hooks correctly implemented , printObjectLine, printObjectSubLine
2015-11-02 10:44:59 +01:00
Laurent Destailleur
8f2fb3cbee Merge pull request #3845 from frederic34/patch-19
Remove incomplete llx_stock_lotserial migration
2015-11-02 10:43:55 +01:00
Laurent Destailleur
37f01f995c Merge pull request #3853 from aspangaro/develop-71
Salaries : Replace "label for" by the function fieldLabel & add some notes & correct typo
2015-11-02 10:42:19 +01:00
All-3kcis
a658ff7e90 add commit or rollback if error 2015-11-02 10:26:07 +01:00
Laurent Destailleur
a161e6d47a Continue debug of PRODUIT_MULTIPRICES option.
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
2015-11-02 10:09:09 +01:00
frederic34
3e752ed5c8 Typo 2015-11-02 09:46:21 +01:00
Laurent Destailleur
6fe43cbbeb Removed dead code 2015-11-02 09:08:08 +01:00
Laurent Destailleur
3409686405 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-02 08:57:01 +01:00
aspangaro
ac47c2f22e Merge remote-tracking branch 'Upstream/develop' into develop-71 2015-11-02 06:44:16 +01:00
aspangaro
d8f77f58d7 Salaries : Replace "label for" by the function fieldLabel & add some notes 2015-11-02 06:42:17 +01:00
aspangaro
cc257d8abc Typo 2015-11-01 22:54:33 +01:00
aspangaro
6df524bcb0 Remove blank page 2015-11-01 22:54:04 +01:00
Regis Houssin
0fd7ba478a Fix: add Mac OS 2015-11-01 17:27:41 +01:00
frederic34
b9367bb196 Errors management 2015-11-01 11:24:51 +01:00
frederic34
2b4224d4c4 List Jobs 2015-11-01 10:10:14 +01:00
frederic34
2f3e6958f9 Receipt Printer 2015-11-01 00:58:08 +01:00
frederic34
bb06a55844 Work on list jobs 2015-10-31 23:27:10 +01:00
Juanjo Menent
a58b5f26f6 Merge pull request #3774 from marcosgdf/multiprice-generator
NEW Level multiprice generator based on per cent variations over base price
2015-10-31 23:03:19 +01:00
Juanjo Menent
fb03643f42 Merge pull request #3850 from frederic34/paypal
Translation in paypal lib
2015-10-31 22:59:19 +01:00
Juanjo Menent
c096114155 Merge pull request #3849 from grandoc/develop
[Qual] Uniformize code
2015-10-31 22:58:16 +01:00
frederic34
22d1cf860c Add translation 2015-10-31 22:09:50 +01:00
frederic34
df3af6979e Translation in paypal lib 2015-10-31 21:43:59 +01:00
frederic34
0836a84c0e Somme cleaning 2015-10-31 18:06:49 +01:00
philippe grand
ff5fcbbc10 [Qual] Uniformize code 2015-10-31 17:21:48 +01:00
Marcos García de La Fuente
592348850f Added missing SQL statements + reordered them 2015-10-31 11:48:17 +01:00
Marcos García de La Fuente
e1f2efee4d Merge branch 'develop' into multiprice-generator
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-31 11:46:14 +01:00
Frédéric FRANCE
0f6a401edd Update list.php 2015-10-31 11:30:11 +01:00
Frédéric FRANCE
ee94aea1ef Update list.php 2015-10-31 11:28:49 +01:00
Frédéric FRANCE
6e2d4aebb1 Update list.php 2015-10-31 11:27:50 +01:00
Frédéric FRANCE
8a07efb995 Update list.php 2015-10-31 11:25:59 +01:00
Frédéric FRANCE
08dccf341c Update list.php 2015-10-31 11:24:49 +01:00
Frédéric FRANCE
d49d3808b9 Update list.php 2015-10-31 11:19:01 +01:00
Frédéric FRANCE
f3f83fa6c1 Remove incomplete llx_stock_lotserial migration
There is two creation of this table in migration script, keeping the more complete
2015-10-31 10:32:41 +01:00
Frédéric FRANCE
4108f55c1e Update 3.8.0-3.9.0.sql 2015-10-31 10:07:13 +01:00
Frédéric FRANCE
4160342656 Update llx_c_hrm_function.sql 2015-10-31 10:05:34 +01:00
Juanjo Menent
6f1acf8327 Merge pull request #3842 from grandoc/develop
[Qual] Uniformize code
2015-10-30 22:25:37 +01:00
Juanjo Menent
2f8afda29d Merge pull request #3833 from grandoc/3.8
[Qual] Prevent warning
2015-10-30 22:19:44 +01:00
Juanjo Menent
efb6e87f3f Merge pull request #3839 from fmarcet/3.8
FIX Bad parameter on calling get_exdir function
2015-10-30 22:13:36 +01:00
philippe grand
975fe064ae [Qual] Uniformize code 2015-10-30 21:59:22 +01:00
Laurent Destailleur
6482a4ee04 Minor css fix 2015-10-30 20:04:03 +01:00
Laurent Destailleur
a8d28b5e46 NEW Add a filter field to restrict list of member when doing a LDAP list
request. Use also this filter into ldap command line script making sync
from ldap to dolibarr.
2015-10-30 19:23:23 +01:00
frederic34
b6be372c4b Merge remote branch 'upstream/develop' into printgcp 2015-10-30 18:12:34 +01:00
frederic34
e90f68906e SQL tables for oauth 2015-10-30 17:59:45 +01:00
frederic34
1694c690ed Printing with Google Cloud Print 2015-10-30 17:22:06 +01:00
Laurent Destailleur
e01bdebc49 Fix translation 2015-10-30 14:37:19 +01:00
Ferran Marcet
5862037d34 FIX Bad parameters 2015-10-30 13:03:34 +01:00
Maxime Kohlhaas
59714e4b32 Fix : migration wrong index 2015-10-30 12:41:36 +01:00
Maxime Kohlhaas
c46f9350a5 Fix : stats were wrong if same product on several lines with same quantity because of distinct 2015-10-30 09:50:04 +01:00
Laurent Destailleur
2c682022cf NEW The search box and the bookmarks are now rendered by the menu
manager.
2015-10-30 09:36:57 +01:00
philippe grand
c26c8c7fcc [Qual] Prevent warning 2015-10-30 08:47:30 +01:00
Laurent Destailleur
6cc3df7e71 NEW Quick searh filter works on invoice, proposal, order, intervention,
contract
2015-10-30 08:35:56 +01:00
Laurent Destailleur
3760f247a2 NEW Can now select fields to show in product list. Extrafields are also
supported.
2015-10-30 00:05:00 +01:00
Laurent Destailleur
2b5746aec3 Add field position into some dictionaries tables 2015-10-29 21:25:18 +01:00
Laurent Destailleur
c481dc88ce Clean dead code 2015-10-29 20:25:07 +01:00
Laurent Destailleur
8c8019ee99 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-29 19:18:59 +01:00
Laurent Destailleur
282972784e Prepare table for budget lines 2015-10-29 19:18:41 +01:00
Frédéric FRANCE
ff9648eed9 Update card.php 2015-10-29 19:09:37 +01:00
Frédéric FRANCE
b1c4e032fc Update html.formfile.class.php 2015-10-29 19:08:38 +01:00
Frédéric FRANCE
e5063010b2 Update actions_printing.inc.php 2015-10-29 19:07:00 +01:00
Juanjo Menent
c14349f1ea Merge pull request #3829 from hregis/3.8_bug
Fix: add missing hooks
2015-10-29 16:05:35 +01:00
philippe grand
aa6b5bc1ce [Qual] Uniformize code 2015-10-29 13:58:16 +01:00
fmarcet
440df980ea Fix SQL Query 2015-10-29 13:43:07 +01:00
Regis Houssin
6373c82559 Fix: broken features !!! 2015-10-29 13:14:38 +01:00
fmarcet
dba952e596 Fix: Products image on getNomUrl 2015-10-29 12:51:25 +01:00
fmarcet
310ecb1e09 FIX: Show product image on getNomUrl() 2015-10-29 12:28:28 +01:00
Regis Houssin
e5b1e214bc Fix: add missing hooks 2015-10-29 11:50:16 +01:00
Juanjo Menent
4e937a0252 Merge pull request #3816 from defrance/patch-61
Missing argument 1 for CommonDocGenerator::__construct()
2015-10-29 10:55:20 +01:00
Juanjo Menent
de6bef82dd Merge pull request #3820 from grandoc/develop
[Qual] Uniformize code
2015-10-29 10:54:36 +01:00
Juanjo Menent
b6b8a9e0f0 Merge pull request #3824 from aspangaro/3.8-23
Review 3.8
2015-10-29 10:54:01 +01:00
fmarcet
6469a31a32 Style corrections 2015-10-29 10:38:21 +01:00
fmarcet
62dc6814a3 FIX #3726 Not showing images on product card 2015-10-29 10:14:54 +01:00
aspangaro
4e9d06785c Fix #3818 & presentation 2015-10-29 06:47:42 +01:00
aspangaro
e2ba24826f Review 3.8 2015-10-29 06:06:56 +01:00
Laurent Destailleur
4042c6d5cc Minor fixes 2015-10-28 23:02:02 +01:00
Laurent Destailleur
f5eaeb2fb5 Some minor fixes 2015-10-28 22:51:06 +01:00
Laurent Destailleur
8e1fd5c3ed Uniformize labels and css style 2015-10-28 22:25:15 +01:00
Laurent Destailleur
8f52d426d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-28 22:08:28 +01:00
Laurent Destailleur
8c84ce1576 Create table llx_stock_serial. This table may be used to store eatby and
sellby date for a couple product-batch number in one place only.
2015-10-28 22:05:37 +01:00
philippe grand
d517595f82 [Qual] Uniformize code 2015-10-28 19:28:18 +01:00
Juanjo Menent
0bcb9dde10 Merge pull request #3810 from grandoc/develop
[Qual] Uniformize code
2015-10-28 16:11:40 +01:00
Juanjo Menent
a36559c55c Merge pull request #3809 from aspangaro/develop-hrm
HRM module : continue to work
2015-10-28 16:11:17 +01:00
phf
4180862fec Merge branch '3.8' into fix_3.8_clone_order 2015-10-28 14:36:31 +01:00
phf
f385f8bcfa FIX better fix to generate a PROV ref after clone 2015-10-28 14:34:34 +01:00
BENKE Charlie
8cf2aa456b Missing argument 1 for CommonDocGenerator::__construct()
add _construct on htdocs/core/class/commondocgenerator.class.php class need to send $db as parameters
2015-10-28 13:59:05 +01:00
Florian HENRY
9a95401473 FIX : add tag myuser_job into ODT replacement 2015-10-28 11:27:39 +01:00
Laurent Destailleur
1eca2d33c0 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-27 22:24:29 +01:00
Laurent Destailleur
87c240252c FIX Can export a field into task time table with export project profile 2015-10-27 22:24:18 +01:00
Laurent Destailleur
f9c9c58cba Label must be cheque or transfer 2015-10-27 20:36:27 +01:00
Laurent Destailleur
76ded0acea Fix using DATE_FORMAT is forbidden 2015-10-27 19:26:33 +01:00
Laurent Destailleur
fb28586f32 Better visible of what is possible for stock management 2015-10-27 19:18:22 +01:00
fappels
8992cfaeb4 move require_once 2015-10-27 15:50:55 +01:00
philippe grand
12e7c7b9e4 [Qual] Uniformize code 2015-10-27 13:42:00 +01:00
Marcos García de La Fuente
eff1f73950 Merge branch 'develop' into multiprice-generator
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
#	htdocs/product/price.php
2015-10-27 10:41:50 +01:00
Sergio Sanchis Climent
b1bc000bae standardize 2015-10-27 09:19:39 +01:00
aspangaro
93d340e497 HRM module : continue to work 2015-10-27 07:26:57 +01:00
aspangaro
b90c56fbb5 HRM : move migration into 3.8 to 3.9 2015-10-27 06:29:18 +01:00
Laurent Destailleur
0a3ba3a0c6 Fix picto 2015-10-26 23:36:05 +01:00
Laurent Destailleur
f4184c9dfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-26 23:33:51 +01:00
Laurent Destailleur
7d8fab73e1 Merge pull request #3792 from grandoc/develop
[Qual] Uniformize code
2015-10-26 23:03:30 +01:00
Laurent Destailleur
24c3491ff7 Code comment 2015-10-26 22:56:54 +01:00
Laurent Destailleur
4f04775b41 Merge pull request #3800 from olsesacl/develop
error this.price > 0 always false
2015-10-26 22:40:26 +01:00
Laurent Destailleur
0c83d152fc Merge pull request #3795 from grandoc/patch-1
Update index.php
2015-10-26 22:39:32 +01:00
Laurent Destailleur
eb42e0fc4f Merge pull request #3799 from aspangaro/develop-69
Typo
2015-10-26 22:39:14 +01:00
fappels
4d839eea60 Fix #2591 Margin is incorrect used with POS
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
Alexis Algoud
fa3af485ef FIX action not appear before an update
because of a lack of line in action ressource
2015-10-26 18:33:22 +01:00
Laurent Destailleur
6f1d758eae Fix print feature for md theme 2015-10-26 16:42:31 +01:00
Laurent Destailleur
6493438e87 NEW The clicktodial module is now able to provide link "tel:" on phone
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
2015-10-26 16:20:09 +01:00
Laurent Destailleur
07b277b23f Prepare fields in dtabase to store if time spent was invoiced or not. 2015-10-26 15:22:33 +01:00
atm-robin
29b8919a40 FIX supplier rights for orderToInvoice 2015-10-26 14:34:46 +01:00
Sergio Sanchis Climent
990fbf3ef4 hooks correctly implemented , printObjectLine, printObjectSubLine
In hook can change correctly label and ref (for my module need if is posible)
2015-10-26 14:00:43 +01:00
Laurent Destailleur
4b2db78c3a Keep deprecated options to show or not forms for blind people. 2015-10-26 12:50:32 +01:00
Laurent Destailleur
d5e42478a9 Removed deprecated options to show or not forms. Such forms does not
exists anymore.
2015-10-26 12:37:36 +01:00
Laurent Destailleur
5c4ac0bf62 NEW Merge all left menu search boxes into one. 2015-10-26 12:18:22 +01:00
Sergio Sanchis Climent
2696369470 Merge remote-tracking branch 'upstream/develop' into develop 2015-10-26 11:38:52 +01:00
Sergio Sanchis Climent
4fd0086862 Fix: error this.price > 0
if no parse this.price when compare this.price and 0 always false
2015-10-26 11:33:43 +01:00
Laurent Destailleur
71da059ef0 NEW Add a new widget $form->selectArrayAjax() to use combo list with
content coming from an Ajax URL.
2015-10-26 11:23:31 +01:00
Maxime Kohlhaas
4b7c451f3d Option of standalone creditnote is hidden 2015-10-26 09:43:58 +01:00
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
aspangaro
f15e672c56 Typo 2015-10-26 05:40:34 +01:00
Laurent Destailleur
132bc610b6 Icon for contact contains a part of thirdparty icon to make things
easier to understand
2015-10-25 23:32:49 +01:00
Laurent Destailleur
080ba15e0d FIX The price per level just never correctly manage the vat. Vat is not
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
2015-10-25 22:50:05 +01:00
philippe grand
83420880dd Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-25 21:07:36 +01:00
Laurent Destailleur
77a0359cfc Fix bad test 2015-10-25 20:17:43 +01:00
Laurent Destailleur
295eb533f8 FIX Bad picto for expense report 2015-10-25 20:16:40 +01:00
Laurent Destailleur
9a4b62c279 NEW Introduce use of cache for thumbs images of users 2015-10-25 20:15:52 +01:00
Laurent Destailleur
54883f2d84 FIX Bad picto for expense report 2015-10-25 20:14:57 +01:00
Laurent Destailleur
24732cf454 Fix to avoid duplicate tooltip 2015-10-25 20:01:39 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
4e206fa80b Fix doxygen 2015-10-25 19:53:59 +01:00
Laurent Destailleur
d7761ece58 FIX The thumb of user into top menu was using the image in full size.
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:54 +01:00
Laurent Destailleur
48ed8d4408 FIX The thumb of user into top menu was using the image in full size.
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:00 +01:00
Laurent Destailleur
b49d63c12f NEW Show photo of user into user list. A new function
getImageFileNameForSize was also introduced to choose image best size
according to usage to save bandwith.
2015-10-25 19:31:42 +01:00
Laurent Destailleur
1261ad43a1 NEW Can select which field to show into list of users. 2015-10-25 18:15:37 +01:00
Laurent Destailleur
1b8234d9fe Bette behaviour for blind people 2015-10-25 11:09:50 +01:00
Laurent Destailleur
461771d488 Currency is on title only. 2015-10-24 21:20:32 +02:00
Laurent Destailleur
b88a28b660 Restore compatibility with old version 2015-10-24 19:45:41 +02:00
Laurent Destailleur
5181afd49d Disable dead code 2015-10-24 19:29:41 +02:00
Laurent Destailleur
086582a7a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-24 16:09:36 +02:00
Laurent Destailleur
3015a0388a NEW List of projects of a thirdparty are visible on a project tab 2015-10-24 16:09:26 +02:00
Laurent Destailleur
082e41b6c0 Bette translation 2015-10-24 13:58:28 +02:00
Laurent Destailleur
43c80bec7d A better responsive menu for very small screen 2015-10-24 13:52:35 +02:00
Laurent Destailleur
c007ae9361 Fix php code not executed with some php version 2015-10-24 13:16:59 +02:00
Philippe Grand
8fffdae1fb Update index.php 2015-10-23 19:01:50 +02:00
Laurent Destailleur
2cbfb69f9b Update template 2015-10-23 15:28:14 +02:00
Laurent Destailleur
016dbd39ee Fix sql phpunit regression 2015-10-23 15:24:47 +02:00
Laurent Destailleur
f3a5331095 Merge pull request #3793 from olsesacl/develop-employee
Fix: Bug: if $this->employe no exist
2015-10-23 15:14:30 +02:00
Laurent Destailleur
a01a85c3f6 FIX tag object_total_vat_x need x to be a string with unknown decimal
lenght. Now use for x the real vat real with no more decimal (x = 20 or
x = 8.5 or x = 5.99, ...)
2015-10-23 15:13:02 +02:00
Laurent Destailleur
f6d30d8b9e Fix: W3C no form into table 2015-10-23 14:40:45 +02:00
Laurent Destailleur
8d24adc97e Remove 2 other duplicated pages. There is only one page now for all list
of thirdarties (with a parameter type to have it specialized per
customer, prospect or supplier profile).
2015-10-23 13:52:51 +02:00
Sergio Sanchis Climent
2a412af00b Fix: Bug: if $this->employe no exist
Fix: if this->employee no exist default 0
2015-10-23 13:04:33 +02:00
philippe grand
3767ab437e [Qual] Uniformize code 2015-10-23 12:58:30 +02:00
Laurent Destailleur
90a221ef6d Fix version of module 2015-10-22 19:46:30 +02:00
Laurent Destailleur
633055fe5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 19:44:00 +02:00
Laurent Destailleur
1000fd1b21 Add field employee for hr module 2015-10-22 19:43:50 +02:00
Laurent Destailleur
8df59134a9 Merge pull request #3705 from aspangaro/develop-hrm
New : Module HRM
2015-10-22 19:15:49 +02:00
Laurent Destailleur
531ef43a27 Some minor look fixes. 2015-10-22 19:13:16 +02:00
Laurent Destailleur
cac4a85ccd Merge pull request #3788 from atm-maxime/new_customer_recap
New customer recap
2015-10-22 18:02:38 +02:00
Laurent Destailleur
9f21ea58a3 A lot hooks used into PDF generation were not correctly implemented. We
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must 
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
2015-10-22 17:51:05 +02:00
Laurent Destailleur
56ef1c7338 Fix missing ) 2015-10-22 17:05:28 +02:00
Maxime Kohlhaas
ef2337a338 Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
Conflicts:
	htdocs/compta/facture/list.php
2015-10-22 14:41:58 +02:00
All-3kcis
00c2b1a32a move db->begin() before trigger 2015-10-22 14:30:11 +02:00
Laurent Destailleur
77c43ebb26 FIX #3558 2015-10-22 14:08:19 +02:00
Laurent Destailleur
2615e02e1e Update doc 2015-10-22 13:18:51 +02:00
Laurent Destailleur
9cce56895c Merge branch 'patch-77' of https://github.com/defrance/dolibarr into
defrance-patch-77

Conflicts:
	htdocs/core/lib/admin.lib.php
2015-10-22 13:13:02 +02:00
Laurent Destailleur
3d7050e051 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 12:29:35 +02:00
Laurent Destailleur
9cbb9129c2 FIX #3772 2015-10-22 12:29:24 +02:00
Laurent Destailleur
ce681081c1 Merge pull request #3776 from frederic34/patch-15
Set warehouse for order
2015-10-22 12:16:40 +02:00
All-3kcis
ceae04b76e move trigger before query 2015-10-22 12:03:01 +02:00
Laurent Destailleur
d55f138fb1 Merge pull request #3785 from frederic34/patch-19
FIX Error message not returne into update fournisseur.commande.class.php
2015-10-22 10:43:10 +02:00
Laurent Destailleur
b4c2fc7101 Merge pull request #3782 from frederic34/patch-17
Add draft suppliers orders in /comm/index
2015-10-22 10:42:07 +02:00
Laurent Destailleur
c682065ca4 Merge pull request #3780 from frederic34/patch-16
Fix some action has no effect in shipment
2015-10-22 10:40:28 +02:00
Laurent Destailleur
a5912d1909 Merge pull request #3778 from grandoc/develop
[Qual] Uniformize code
2015-10-22 10:39:55 +02:00
Laurent Destailleur
f312ee58de Merge pull request #3779 from All-3kcis/develop-patch-10
Correct return value
2015-10-22 10:35:55 +02:00
Laurent Destailleur
24919b1f3d Merge pull request #3781 from jpfox/patch-1
fix test against empty amount on book update
2015-10-22 10:35:26 +02:00
Laurent Destailleur
40adaf716d Uniformize index names 2015-10-22 10:33:42 +02:00
Laurent Destailleur
4453ba53fd Fix migration error 2015-10-22 10:28:59 +02:00
frederic34
865e9d9738 Merge remote branch 'upstream/develop' into patch-15
Conflicts:
	htdocs/langs/en_US/admin.lang
2015-10-22 10:28:06 +02:00
Laurent Destailleur
8bdbed69c9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2015-10-22 10:22:54 +02:00
Laurent Destailleur
81d4148f4a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-22 09:50:26 +02:00
Laurent Destailleur
474692e71a Remove duplicate page fourn/list.php 2015-10-22 09:48:16 +02:00
Laurent Destailleur
7daf9d10af Work on the new selectArrayAjax widget 2015-10-21 20:50:27 +02:00
Laurent Destailleur
fd72b4a400 Work on the new selectArrayAjax widget 2015-10-21 20:43:11 +02:00
Frédéric FRANCE
4689b0cc11 Update fournisseur.commande.class.php 2015-10-21 17:31:51 +02:00
philippe grand
c9d1b72087 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-21 13:43:04 +02:00
All-3kcis
ca8c1adf55 Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price() 2015-10-21 10:07:53 +02:00
BENKE Charlie
ef79bb3b67 Update dict.php 2015-10-21 05:23:49 +02:00