lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
52,241 Commits 43 Branches 150 Tags 886 MiB
3.9.2
Commit Graph

45041 Commits

Author SHA1 Message Date
Laurent Destailleur
994715f8bb Upgrade romania 2016-02-19 15:47:00 +01:00
aspangaro
d77a8bddcf Fixed: Members - Problem of tab & missing language file 2016-02-19 07:39:14 +01:00
Laurent Destailleur
cc524c8180 Fix bad picto 2016-02-19 04:41:29 +01:00
Laurent Destailleur
79bc7cf085 Fix showing description 2016-02-19 04:05:08 +01:00
Laurent Destailleur
3864bd35c9 Fix NPR Vat is working correctly with multiprice too 2016-02-19 03:59:43 +01:00
Laurent Destailleur
b70f2f329c Fix bad position of form 2016-02-19 03:59:22 +01:00
Laurent Destailleur
9e11fd988d Fix: color of category when showing full path must use color of last 
element of path
 2016-02-19 03:32:02 +01:00
Laurent Destailleur
16c44af690 Fix bad example of setup to use 2016-02-19 02:44:56 +01:00
Laurent Destailleur
4d0b9946f5 FIX Maxi serious problem when updating prices and vat of a product. All 
mode (one price, price per level, ...) were impacted. Localtax setup
were lost.
 2016-02-19 02:41:00 +01:00
Laurent Destailleur
3b5ce32cb0 Code comment 2016-02-19 01:47:00 +01:00
Laurent Destailleur
bd80249580 Fix code comment 2016-02-19 01:45:52 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/charges/index.php
 2016-02-18 23:27:57 +01:00
Laurent Destailleur
b0b2668428 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89 Several fixes in stock management (label, and bad action when lot module 
is on)
 2016-02-18 23:21:02 +01:00
BENKE Charlie
9fd22722ff left a space between clone and $object 2016-02-18 15:18:47 +01:00
Raphaël Doursenaud
dfe7c6f06f Fix #4649 Wrong parameters order 2016-02-18 12:21:11 +01:00
Laurent Destailleur
1a12eb33d6 Merge pull request #4639 from grandoc/3.9 
[quality] : better help
 2016-02-18 00:31:38 +01:00
Laurent Destailleur
7ba6754a55 Fix the missing button to record reception 2016-02-18 00:27:35 +01:00
Laurent Destailleur
5d2c189e0e Fix bad place of table 2016-02-17 23:45:25 +01:00
Laurent Destailleur
633de3bcb4 Fix list of object referers should not be set to invoice by default (may 
be module is disabed). I replace with a message to choose list.
 2016-02-17 22:33:02 +01:00
Florian HENRY
d44c04877a Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-17 12:54:47 +01:00
philippe grand
03b9b65d93 [quality] : better help 2016-02-16 16:45:19 +01:00
Laurent Destailleur
14fb2c914a Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output 2016-02-16 15:41:55 +01:00
Laurent Destailleur
d8e173af03 Fix regression (class not found, css on hover broken) with try to manage 
contrast on categories.
 2016-02-16 15:01:28 +01:00
jfefe
841145678d Always check links color when background color is set onto category 2016-02-16 12:56:57 +01:00
jfefe
134c9d13bc FIX : check contrast of link when using background color for category 2016-02-16 12:45:18 +01:00
Regis Houssin
d55ac472c3 Fix: issue when bank module is disabled 
Fix: missing entity filter for lines of payment
 2016-02-16 11:27:58 +01:00
Florian HENRY
49a33cb8f9 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-16 10:30:17 +01:00
Laurent Destailleur
816195cb43 Merge pull request #4600 from aspangaro/3.9-p11 
Modifiy menu for accountancy module - New balance feature
 2016-02-15 13:55:51 +01:00
Laurent Destailleur
353fa7c2fc Little cleaning on how options ar shown 2016-02-15 07:12:23 +01:00
aspangaro
d4057c3feb Fixed: Correct problem of rights beetween tax and salaries module 2016-02-15 06:56:51 +01:00
aspangaro
a8ead1d44c Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11 
Correct conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-15 06:31:34 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
 2016-02-15 01:37:23 +01:00
Laurent Destailleur
1cf2b1b3af Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-15 01:19:57 +01:00
Laurent Destailleur
c85b7932a9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2016-02-15 01:18:59 +01:00
Laurent Destailleur
f1c9a6fe48 Merge pull request #4594 from grandoc/3.9 
default sort should be from A to Z
 2016-02-15 00:39:00 +01:00
Laurent Destailleur
0c4d44a86c Merge pull request #4591 from FHenry/3.9 
Accoutancy
 2016-02-15 00:35:24 +01:00
Laurent Destailleur
0d5f30f627 Merge pull request #4589 from frederic34/patch-8 
Update google_oauthcallback.php
 2016-02-15 00:34:22 +01:00
Laurent Destailleur
1cb6c7f3e9 Merge pull request #4603 from GPCsolutions/3.9-4597 
FIX #4597 PHP 7 Uniform Variable Syntax
 2016-02-15 00:32:11 +01:00
Laurent Destailleur
a9aab7545e Merge pull request #4575 from altatof/fix_ttc_display 
FIX: add missing global def for ttc column
 2016-02-15 00:14:34 +01:00
Laurent Destailleur
3925ae0742 Fix: we loose ability to refresh contact list when changing a company on 
contact tab
 2016-02-14 23:54:07 +01:00
Laurent Destailleur
2fd01d71cf Fix #4548 Check on stock enough must be done according to warehouse 2016-02-14 22:20:42 +01:00
Laurent Destailleur
04b390f21c Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE 
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
 2016-02-14 21:59:04 +01:00
Laurent Destailleur
13c85516ee Doc comment 2016-02-14 21:58:54 +01:00
abb
834f0b20ae fix:no transaction in this place 2016-02-14 20:55:09 +01:00
abb
2f99273734 fix:no transaction in this place 2016-02-14 20:51:36 +01:00
Laurent Destailleur
666a3d907d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-14 20:48:39 +01:00
Laurent Destailleur
b7ae5bac6f Fix: The text "All" is not appropriate. 2016-02-14 20:48:25 +01:00
Laurent Destailleur
cc174daa13 Prepare 3.8.4 2016-02-14 20:12:47 +01:00
Laurent Destailleur
b091d4e897 Merge pull request #4586 from hregis/3.8_bug 
Fix: missing signature and uniformize code between card and script
 2016-02-14 15:50:36 +01:00
Laurent Destailleur
e28c3a3ee7 Merge pull request #4585 from grandoc/3.8 
fix : Strict Standards: Only variables should be passed by reference
 2016-02-14 12:53:09 +01:00
Laurent Destailleur
9f75ac499f Merge pull request #4606 from frederic34/patch-9 
Update 3.8.0-3.9.0.sql
 2016-02-14 12:25:54 +01:00
Laurent Destailleur
d973596601 Merge pull request #4587 from frederic34/patch-7 
Update modOauth.class.php
 2016-02-14 12:21:03 +01:00
Laurent Destailleur
969314e731 Fix: disabling option lead in not working dolibarr 2016-02-12 12:19:32 +01:00
Laurent Destailleur
1c6d154a77 Fix: disabling option lead in not working dolibarr 2016-02-12 12:19:11 +01:00
gauthier
756b50b9d3 FIX : search product in customer product prices doesn't work 2016-02-12 12:06:23 +01:00
Frédéric FRANCE
ad534c90e6 Update 3.8.0-3.9.0.sql 2016-02-12 10:34:21 +01:00
Raphaël Doursenaud
d038ca1875 FIX #4597 PHP 7 Uniform Variable Syntax 
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
 2016-02-11 20:01:51 +01:00
Laurent Destailleur
51cc252d4a Fix: submit was no more possible from keyboard 2016-02-11 15:47:47 +01:00
Laurent Destailleur
518080468e Fix button create template must be visible only if amount is != 0 2016-02-11 10:39:01 +01:00
aspangaro
f1a26cf54b Correct problem of merging for language file 2016-02-11 06:49:49 +01:00
aspangaro
87fee74fb1 Modify menu for accountancy module - New balance feature 2016-02-11 06:48:23 +01:00
aspangaro
b47252fcb6 Modifiy menu for accountancy module - New balance feature 2016-02-11 06:39:02 +01:00
Laurent Destailleur
e169cd3364 Fix usage of filter into selection of email members into emailing. 2016-02-10 23:48:18 +01:00
Laurent Destailleur
6dbaba6973 Fix: previous and next arrow 2016-02-10 17:45:26 +01:00
Florian HENRY
23e35a6012 update size of elementtype column into llx_actioncomm (module_subelement 
name can be longer than 32)
 2016-02-10 14:21:57 +01:00
philippe grand
39feb45779 default sort should be from A to Z 2016-02-10 12:15:22 +01:00
philippe grand
d02f8393dc Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-02-10 11:43:33 +01:00
Florian HENRY
ef7e245432 g 2016-02-09 19:23:17 +01:00
Florian HENRY
44e39519b0 add accountancy balance 2016-02-09 19:20:03 +01:00
Florian HENRY
05d7b14786 Accoutancy 2016-02-09 19:11:19 +01:00
Florian HENRY
61dc17f280 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-09 19:07:04 +01:00
Laurent Destailleur
7ef0415aca Small per enhancement 2016-02-09 15:57:24 +01:00
Laurent Destailleur
223195538a Return bad late or not status for order 2016-02-09 14:29:12 +01:00
Frédéric FRANCE
c28f977e02 Update printgcp.modules.php 2016-02-09 14:12:34 +01:00
Frédéric FRANCE
ffccd43aab Update oauth.php 2016-02-09 14:08:50 +01:00
Frédéric FRANCE
51da5ea1f0 Update printgcp.modules.php 2016-02-09 14:07:54 +01:00
Frédéric FRANCE
73041b0be5 Update google_oauthcallback.php 2016-02-09 14:05:05 +01:00
Frédéric FRANCE
5dd016c3bc Update modOauth.class.php 2016-02-08 17:55:29 +01:00
Laurent Destailleur
50eae967bc Fix disabled entries were no greyed 2016-02-08 17:48:14 +01:00
Sof
19b333f78b FIX : Typo 2016-02-08 14:48:05 +01:00
Regis Houssin
0b25601307 Fix: wrong object name 2016-02-08 12:31:40 +01:00
Regis Houssin
9b10f030bf Fix: missing signature and uniformize code between card and script 2016-02-08 12:20:40 +01:00
Florian HENRY
2991084061 fx accountancy 2016-02-08 10:50:40 +01:00
philippe grand
a15d03a676 fix : Strict Standards: Only variables should be passed by reference 2016-02-08 10:06:32 +01:00
Laurent Destailleur
c4c7ea2f22 FIX Relative discount decimals are not saved 2016-02-08 02:49:19 +01:00
aspangaro
eaca582cb5 Fixed: Problem of merging - Review page init accountancy again 2016-02-07 08:47:02 +01:00
aspangaro
9d427d2248 Fixed: Missing link in eldy menu to init accountancy 2016-02-07 07:41:53 +01:00
Laurent Destailleur
84f4f2d40f FIX The search on user/group was not using new code. Fiels used for 
search was not visible.
 2016-02-07 02:55:56 +01:00
Laurent Destailleur
4c859999e8 Fix first install on debian. 2016-02-06 17:19:57 +01:00
Laurent Destailleur
c6fe8e5479 Fix first install on debian. 2016-02-06 17:13:24 +01:00
Laurent Destailleur
ebd9a97bab Prepare 3.9 2016-02-06 15:55:05 +01:00
Laurent Destailleur
58f728eae5 Prepare 3.9rc 2016-02-06 15:11:45 +01:00
Laurent Destailleur
806d3642d8 FIX Bad filter on opportunities 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2016-02-06 15:09:57 +01:00
Laurent Destailleur
fd7a05490d DiscountOffered text was too long 2016-02-05 20:06:07 +01:00
Laurent Destailleur
96bf59f065 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 19:21:59 +01:00
Christophe Battarel
7a6c7f10a6 FIX: add missing global def for ttc column 2016-02-05 19:14:40 +01:00
Laurent Destailleur
36a29872b1 Merge pull request #4559 from fmarcet/3.8 
FIX: Check stock of batch on shippment
 2016-02-05 18:41:01 +01:00
Laurent Destailleur
7044e62afa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-05 18:37:13 +01:00
Laurent Destailleur
bf7181a064 All messages separated with , into errorsToString 2016-02-05 18:37:01 +01:00
Laurent Destailleur
02c54f4ea6 Merge pull request #4573 from altatof/fix_ttc 
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
 2016-02-05 18:34:45 +01:00
Christophe Battarel
f0aef88589 better fix 2016-02-05 13:49:19 +01:00
Christophe Battarel
36c7697b63 FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 
3.7
 2016-02-05 13:43:06 +01:00
fmarcet
ede4453164 Fix: Avoid errors when batch stock is negative 2016-02-05 12:59:32 +01:00
fmarcet
01f2180822 Merge remote-tracking branch 'origin/3.8' into 3.8 2016-02-05 12:57:43 +01:00
Laurent Destailleur
713050bd57 Fix style on payment page 2016-02-05 12:46:41 +01:00
Laurent Destailleur
062deae24c Merge 2016-02-05 12:18:50 +01:00
Laurent Destailleur
e9ee816826 Merge pull request #4561 from fappels/3.8 
Fix #4556 Desired minimum stock and Stock limit for alert cleared on modify product
 2016-02-05 11:12:31 +01:00
Laurent Destailleur
c9c5484805 Merge pull request #4570 from frederic34/patch-8 
Update CMailFile.class.php
 2016-02-05 10:58:42 +01:00
Laurent Destailleur
0ae8a3398d Fix sql error when extrafields on contact 2016-02-05 10:56:45 +01:00
Laurent Destailleur
69e0f1ebc3 Add log to help debug 2016-02-04 17:55:30 +01:00
Frédéric FRANCE
a656607122 Update CMailFile.class.php 2016-02-04 17:12:58 +01:00
Francis Appels
5f7cb75518 Fix #4556 desiredstock and seuil_stock_alerte cleared on modify product card 
removed inputs from update form also removed from update action
 2016-02-03 19:52:09 +01:00
fmarcet
6260c1ae9e FIX: Check stock of batch on shippment 2016-02-03 11:33:13 +01:00
Laurent Destailleur
19300a2d82 Fix warning when javascript disabled 2016-02-03 03:10:58 +01:00
Laurent Destailleur
f4d04b8f26 FIX part of #4227 2016-02-03 02:41:07 +01:00
Laurent Destailleur
6f1ddd3ba4 Fix on ref not correctly initialized. 2016-02-03 02:29:19 +01:00
Laurent Destailleur
d85f7be1f5 FIX #4423 2016-02-03 02:06:12 +01:00
Laurent Destailleur
165771b652 FIX #4439 2016-02-03 01:46:30 +01:00
Laurent Destailleur
229199aaad FIX #4497 2016-02-03 01:32:50 +01:00
Laurent Destailleur
ee4b437bff Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-03 01:20:23 +01:00
Laurent Destailleur
bbf15d6a5d FIX #4498 2016-02-03 01:20:06 +01:00
Laurent Destailleur
e22664b8cf FIX #4528 2016-02-03 01:01:14 +01:00
Laurent Destailleur
1548be2614 Merge pull request #4549 from FHenry/3.9 
Accountancy module
 2016-02-02 17:15:01 +01:00
Laurent Destailleur
325c35d355 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-02 15:39:44 +01:00
Laurent Destailleur
43ac8b72a3 Merge pull request #4542 from aspangaro/3.9-p9 
New accountancy menu for auguria
 2016-02-02 15:32:32 +01:00
Laurent Destailleur
687afeaffe FIX No project fields if module disabled 2016-02-02 15:09:01 +01:00
Florian HENRY
c1f084b448 Fix accountancy 2016-02-02 11:11:08 +01:00
Florian HENRY
2887eb8c70 fix accountancy 2016-02-02 11:02:58 +01:00
Florian HENRY
22ce2872ac Fix journal 2016-02-02 11:01:15 +01:00
Florian HENRY
564594c3d7 Fix accountancy 2016-02-02 10:58:12 +01:00
Florian HENRY
48b191b1ff Fix tuff into accountancy 2016-02-01 15:08:01 +01:00
Florian HENRY
65162ae8e9 Accountancy modules 2016-02-01 14:59:13 +01:00
Florian HENRY
165b553a79 Format code 2016-02-01 14:50:25 +01:00
fmarcet
d6cda60ed1 FIX: Check stock of product by warehouse if $entrepot_id defined on shippings 2016-02-01 13:40:02 +01:00
fmarcet
acc9879c7c FIX: It doesn't check if there is enough stock to update the lines of orders/invoices 2016-02-01 13:05:14 +01:00
Laurent Destailleur
f22373b70b Fix bad management of option MAIN_HTML_TITLE 2016-02-01 01:19:37 +01:00
Laurent Destailleur
640adcc666 Missing translation 2016-01-31 21:23:30 +01:00
Laurent Destailleur
2d0c823ffe Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:45:06 +01:00
Laurent Destailleur
7b15ac1179 Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:44:09 +01:00
aspangaro
2fa01a1754 Merge remote-tracking branch 'Upstream/3.9' into 3.9-p9 2016-01-31 07:33:57 +01:00
aspangaro
c77fda5128 New accountancy menu for auguria 2016-01-31 07:31:48 +01:00
Laurent Destailleur
9a87d2bee5 Fix phpcs 2016-01-30 16:28:48 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +01:00
Laurent Destailleur
dfd4d36bdf Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-30 15:58:11 +01:00
Laurent Destailleur
c9661ee20e Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-30 15:57:09 +01:00
Laurent Destailleur
129f5aad8e Fix bad translation 2016-01-30 15:56:04 +01:00
mic9p
8faeac611a Do not select siren but tva_intra from societe 
VAT report by customer shows an empty field.
 2016-01-30 15:35:28 +01:00
Laurent Destailleur
6e69e99227 FIX VAT Rate was not visible in log of old price list 2016-01-30 15:34:06 +01:00
Laurent Destailleur
5212303208 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-30 15:29:52 +01:00
Laurent Destailleur
d21908755e FIX Import/Export NPR VAT 2016-01-30 15:29:35 +01:00
Laurent Destailleur
cc7d105d88 Fix height in mapping impot step 2016-01-30 15:07:22 +01:00
Laurent Destailleur
c6a6889d79 Merge pull request #4389 from aspangaro/3.9-p6 
Fix: Some problems presentation on accountancy module
 2016-01-30 13:04:22 +01:00
Laurent Destailleur
09a24b8dd8 Merge pull request #4496 from frederic34/patch-9 
Text not initialized
 2016-01-30 12:24:40 +01:00
Laurent Destailleur
3591f51918 Merge pull request #4480 from hregis/3.8_bug 
Fix: for avoid conflict with "global $m" in memory.lib.php
 2016-01-30 12:22:47 +01:00
Laurent Destailleur
b27e31b3ae Merge pull request #4483 from marcosgdf/bug-4440-3 
Corrected typo of PR #4444
 2016-01-30 12:20:50 +01:00
Laurent Destailleur
c77fcfd291 Merge pull request #4503 from fmarcet/3.9 
FIX: Not returning the correct multilevel price
 2016-01-30 12:05:32 +01:00
Laurent Destailleur
f79b1d06cb Merge pull request #4519 from FHenry/3.9 
FIX : set column paid on expense report when expense is paid
 2016-01-30 12:01:10 +01:00
Laurent Destailleur
e2d9989574 Merge pull request #4518 from FHenry/3.9_compta 
3.9 compta
 2016-01-30 12:00:20 +01:00
Laurent Destailleur
e574ebe34c Merge pull request #4514 from hregis/3.8_bug2 
Fix: missing field "label"
 2016-01-30 11:57:28 +01:00
Laurent Destailleur
f5a4b9db31 Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid 
FIX filter by socid if from customer card
 2016-01-30 11:56:40 +01:00
Laurent Destailleur
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
bobby
72e8680f7c FIX : set column paid on expense report when expense is paid 2016-01-28 13:57:40 +01:00
bobby
6aa6c067fb fix travis 2016-01-28 13:24:38 +01:00
bobby
283412f489 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-28 13:12:57 +01:00
Laurent Destailleur
cd58c93de6 FIX If option to hide automatic ECM is on, dont show menu. 2016-01-28 12:51:34 +01:00
Laurent Destailleur
2141a2f8a1 Fix css 2016-01-28 12:44:04 +01:00
phf
6eecf2f29a FIX filter by socid if from customer card 2016-01-28 12:30:49 +01:00
Laurent Destailleur
83e8efa910 Fix picto private project was same than public project 2016-01-28 12:19:19 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
c09fa6e0dd Fix empty keys are not allowed into select 2016-01-28 12:19:06 +01:00
Laurent Destailleur
c8d232e056 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/card.php
 2016-01-28 12:18:25 +01:00
Regis Houssin
8a80e06580 Fix: missing field "label" 2016-01-28 11:42:00 +01:00
Laurent Destailleur
20e110a882 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-27 18:48:06 +01:00
Laurent Destailleur
45656c18e8 Fix hover css 2016-01-27 18:47:52 +01:00
fmarcet
e3d8a9a8a4 FIX: Doesn't collect the value of the cost price correctly 2016-01-27 12:13:31 +01:00
Christophe Battarel
1baf25de3c FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden 
constant
 2016-01-27 12:04:00 +01:00
fmarcet
eec8d30625 FIX: Not returning the correct multilevel price 2016-01-27 10:57:04 +01:00
Laurent Destailleur
fccecc902d Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 2016-01-26 18:30:08 +01:00
Laurent Destailleur
5fd6057c6c FIX Deadlock situation. Can't edit anymore contract. 
FIX List of automatic events was not visible.
 2016-01-26 18:22:37 +01:00
Laurent Destailleur
25924f31ad Bad translation 2016-01-26 17:57:57 +01:00
Laurent Destailleur
33355c613a FIX When we make a direct assignement on a task to a user, we must check 
he is also assigned to project (and if not assign it)
 2016-01-26 17:50:57 +01:00
fmarcet
c2efee8a29 FIX: Contrat card don't consider user permissions to show active/unactive service button 2016-01-26 13:02:21 +01:00
Laurent Destailleur
d33548e32c Fix in md theme 2016-01-25 17:31:40 +01:00
Laurent Destailleur
0f70ccad50 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-25 15:39:16 +01:00
Laurent Destailleur
feb114625d Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-25 15:37:55 +01:00
Laurent Destailleur
c1b6630c16 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/main.inc.php
 2016-01-25 15:37:04 +01:00
Raphaël Doursenaud
ed16699de6 FIX #4291 Correctly filter external calendar GETPOSTs 2016-01-25 15:32:08 +01:00
Laurent Destailleur
0814fa76f8 FIX CVE CVE-2015-8685 2016-01-25 15:26:52 +01:00
Laurent Destailleur
667651860d Fix sql injection #4341 2016-01-25 15:24:31 +01:00
Frédéric FRANCE
9909918078 Text not initialized 2016-01-25 13:52:35 +01:00
bobby
71c407e670 add coala book keeping export 2016-01-25 12:43:47 +01:00
bobby
c286c4c6ec Accoutancy update 2016-01-25 12:39:21 +01:00
aspangaro
73d5e7036f Refactoring eldy menu to test 2016-01-24 08:21:18 +01:00
aspangaro
e5808f876d Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6 2016-01-24 07:04:20 +01:00
Marcos García de La Fuente
83263e242e Corrected typo of PR #4444 2016-01-23 20:32:22 +01:00
bobby
50d2665b0e Fix travis 2016-01-23 19:42:40 +01:00
bobby
4dd56c52d2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-23 19:39:33 +01:00
Laurent Destailleur
615ffe5417 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-23 12:28:34 +01:00
Laurent Destailleur
a841db1eeb FIX Purge of temp files was broken 2016-01-23 12:24:46 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5 Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-23 11:32:06 +01:00
Laurent Destailleur
3903ced5b4 Fix: link to add at wrong place 2016-01-23 11:30:06 +01:00
Laurent Destailleur
627f606c4d Fix list of leave request was not showing label correctly. 2016-01-23 11:17:20 +01:00
Laurent Destailleur
2b96c8f205 FIX Noway to validate a leave request for some uer even if they have 
permission for.
 2016-01-23 11:05:06 +01:00
Laurent Destailleur
fac38db2bf Merge pull request #4457 from atm-arnaud/3.8_fix_bookmarks_user_update 
FIX bookmark's user change after update if the user isn't superadmin
 2016-01-22 16:42:59 +01:00
Laurent Destailleur
dadc24462a Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:14:39 +01:00
Laurent Destailleur
49a325e7ae Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:10:27 +01:00
Laurent Destailleur
fedf1f3288 Fix view of product image when using old path 
Fix size of image uploaded on user.
 2016-01-22 14:02:48 +01:00
Regis Houssin
2b7b7e014d Fix: for avoid conflict with "global $m" in memory.lib.php 2016-01-22 13:20:21 +01:00
Laurent Destailleur
50b0019ead A protection to avoid situation loosing all admin accounts 2016-01-22 11:54:14 +01:00
Laurent Destailleur
f2f4c60dbd Merge pull request #4469 from aspangaro/3.9-p8 
Fix: Commercial index presentation - missing $var=!$var when we have no data
 2016-01-22 04:15:22 +01:00
Laurent Destailleur
a406334643 Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification 
FIX line refetch incompatible with hook practice
 2016-01-22 04:10:06 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
cbd01bae49 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/societe/index.php
 2016-01-22 03:18:51 +01:00
Laurent Destailleur
d857b3475b Fix doxygen 2016-01-22 03:07:46 +01:00
Laurent Destailleur
56a4466b5b Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-22 03:04:22 +01:00
Laurent Destailleur
34c648b351 FIX #4418 2016-01-22 03:04:07 +01:00
Laurent Destailleur
cd71d53ffd Merge pull request #4422 from marcosgdf/patch-2 
Corrected wrong translation
 2016-01-22 02:11:46 +01:00
Laurent Destailleur
219ce73ea2 Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook 
FIX nblignes not calculated after hook and hook can't modify this val...
 2016-01-22 02:10:36 +01:00
Laurent Destailleur
4e87afddf1 Fix: why a floating float here ? 2016-01-21 22:44:05 +01:00
bobby
57035ace24 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-21 17:09:00 +01:00
Laurent Destailleur
b5c047d9a5 Fix link on project ref on task list must jump to tab task 2016-01-21 15:15:26 +01:00
Laurent Destailleur
39aede4071 Fix bad list of project/tasks 2016-01-21 15:09:46 +01:00
Laurent Destailleur
dd6e60630d Fix size of cells make page too large even for large screen 2016-01-21 15:01:53 +01:00
Laurent Destailleur
3c68ac55b9 Fix missing loading lang 2016-01-21 15:00:39 +01:00
aspangaro
8a36bda3d2 Merge remote-tracking branch 'Upstream/3.9' into 3.9-p8 2016-01-21 05:46:11 +01:00
aspangaro
192c58f10d Fix: Commercial index presentation - missing $var=!$var when we have no data 2016-01-21 05:44:53 +01:00
Alexis Algoud
48d674578b FIX line is refetch (and seems useless) unless it was modified by the hook previous calling 2016-01-19 11:54:07 +01:00
arnaud
9ce6e2938c FIX bookmark's user change after update if the user hasn't superadmin right 2016-01-19 09:46:27 +01:00
Laurent Destailleur
6eb6b0315f Fix bad field used for search on start date 2016-01-18 16:47:14 +01:00
Laurent Destailleur
17ceca3758 Fix: no create button on list 2016-01-18 16:44:04 +01:00
Laurent Destailleur
2386b79dfc FIX Option to disable meteo was not set correctly in edit mode 2016-01-18 14:49:15 +01:00
Regis Houssin
535d3bc087 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2016-01-18 13:04:08 +01:00
Marcos García de La Fuente
da637db162 FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays 2016-01-18 10:17:59 +01:00
Laurent Destailleur
4d2b5d71af Fix missing translation key 2016-01-17 17:35:02 +01:00
Laurent Destailleur
be4f9baac6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-16 10:21:52 +01:00
Laurent Destailleur
d46c655fb4 FIX: Sql syntax error in doc_generic_task_odt 2016-01-16 10:20:14 +01:00
Regis Houssin
6e30d5e516 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2016-01-15 13:16:40 +01:00
Regis Houssin
6aeb18ed75 Revert "Fix: for avoid division by 0" 
This reverts commit c71d578931.
 2016-01-15 13:14:55 +01:00
Regis Houssin
905f9d78ed Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9) 2016-01-15 13:12:19 +01:00
bobby
71a46567ac DEV : Accounting module 2016-01-15 10:44:16 +01:00
bobby
cd8a59f35a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-15 10:01:24 +01:00
Marcos García
ca6c2b4317 Update products.lang 2016-01-15 09:49:52 +01:00
Laurent Destailleur
cb24f2b372 Fix missing type in list 2016-01-15 01:52:16 +01:00
Laurent Destailleur
6acd31f8ad Fix: style required in create or edit mode only 2016-01-15 00:44:38 +01:00
bobby
19bec6b0b3 Manual merge from 3.8 backported 2016-01-14 18:24:02 +01:00
Laurent Destailleur
a0fc26fbd8 Fix missing orde by 2016-01-14 17:09:59 +01:00
Laurent Destailleur
b5f057051b Fix: Missing param into link 2016-01-14 15:45:05 +01:00
Laurent Destailleur
0951042dad Fix: no need of translation tab if multilang was disabled. 2016-01-14 15:00:31 +01:00
Laurent Destailleur
b8b84c67a6 Fix bad setting of default actioncode 2016-01-14 14:15:14 +01:00
arnaud
8b2541ebf9 FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules 2016-01-14 14:10:50 +01:00
Laurent Destailleur
ef7061a575 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and 
SOCIETE_DISABLE_CUSTOMERS
 2016-01-14 12:49:23 +01:00
Laurent Destailleur
23dd6b8388 Fix bad management of option SOCIETE_DISABLE_PROSPECTS and 
SOCIETE_DISABLE_CUSTOMERS
 2016-01-14 12:35:55 +01:00
Laurent Destailleur
ecb4661155 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-14 11:23:11 +01:00
Laurent Destailleur
63ebd40ceb Fix bad var value 2016-01-14 11:22:59 +01:00
Laurent Destailleur
d98415f9b5 Merge pull request #4413 from hregis/3.8_bug 
Fix: ajax error with multicompany module
 2016-01-14 11:08:16 +01:00
Laurent Destailleur
7b4ebb498e Merge pull request #4415 from fappels/3.9-4409 
Fix #4409 totals not shown in stock/list
 2016-01-14 11:07:47 +01:00
Laurent Destailleur
a8148b8b40 FIX Bug: Delivery order and date are not displayed #4372 2016-01-13 20:56:20 +01:00
Laurent Destailleur
55a056a449 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-13 20:41:47 +01:00
Laurent Destailleur
71b264dd86 FIX Bug: Delivery order and date are not displayed #4372 
Link between shipment and delivery receipt was lost.
Status for receipt must not use same label than shipments.
 2016-01-13 20:41:32 +01:00
fappels
f150676908 Fix #4409 totals not shown in stock/list 2016-01-13 16:33:51 +01:00
Regis Houssin
3a3ae90a0a Fix: ajax error with multicompany module 2016-01-13 15:44:26 +01:00
phf
9b682e095f FIX can't clone event 2016-01-13 14:41:32 +01:00
Laurent Destailleur
2c24094d60 Fix bad tab on bad home area page 2016-01-13 13:54:11 +01:00
Laurent Destailleur
9ba25be9bb Change category for application 2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b Fix missing default setup when module is enabled 2016-01-13 13:36:44 +01:00
Laurent Destailleur
93ed7c098b Merge pull request #4407 from atm-ph/fix_3.8_pdf_muscadet_use_hour 
FIX pdf_muscadet delivery hour
 2016-01-12 23:21:05 +01:00
Laurent Destailleur
1b1bd73e6b Merge pull request #4404 from frederic34/patch-8 
FIX When doing payment for money back, bank account was not set by default
 2016-01-12 23:20:32 +01:00
Laurent Destailleur
85747c7383 Merge pull request #4400 from aspangaro/3.8-p1 
Fix: #4394 Untranslated label in list of expense reports
 2016-01-12 23:14:16 +01:00
Laurent Destailleur
0f53c49673 Merge pull request #4392 from aspangaro/3.9-p5 
Fix: HRM index typo and presentation
 2016-01-12 23:00:06 +01:00
Laurent Destailleur
233dc051a1 Merge pull request #4384 from hregis/3.9_bug 
Fix: Gives the possibility to the module, to provide his own family info
 2016-01-12 22:59:43 +01:00
Laurent Destailleur
5b26f456f4 Merge pull request #4356 from GPCsolutions/3.8-4291 
FIX #4291 Correctly filter bank card GETPOSTs
 2016-01-12 22:51:17 +01:00
Laurent Destailleur
64026c41f8 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-01-12 22:03:34 +01:00
Laurent Destailleur
d7fdcc83bb Fix missing search criteria 2016-01-12 22:03:19 +01:00
fmarcet
79992b4947 FIX: The third dashboard don't consider user permissions 2016-01-12 11:34:50 +01:00
phf
f280061a90 FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf 2016-01-12 11:09:47 +01:00
Frédéric FRANCE
92885065c6 Update facture.php 2016-01-12 10:09:02 +01:00
aspangaro
7552fa20eb Fix: #4394 Untranslated label in list of expense reports 2016-01-11 21:18:12 +01:00
Raphaël Doursenaud
7281338f8d FIX #4291 Correctly filter bank card GETPOSTs 2016-01-11 10:51:45 +01:00
aspangaro
880a794acd Merge remote-tracking branch 'Upstream/3.9' into 3.9-p5 2016-01-10 19:54:38 +01:00
Laurent Destailleur
bf09800540 Fix function signature 2016-01-10 18:52:26 +01:00
Laurent Destailleur
861376e461 Merge branch '3.7' of github.com:Dolibarr/dolibarr into 3.7 2016-01-10 18:49:11 +01:00
Laurent Destailleur
a9f0d6964a Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 2016-01-10 18:47:47 +01:00
Laurent Destailleur
801e2bca4b Fix #4239 2016-01-10 18:42:35 +01:00
Laurent Destailleur
cdaccf7c4b Fix: markRate can be 100 2016-01-10 18:28:50 +01:00
aspangaro
a88773cb81 Fix: Some problems presentation on accountancy module 2016-01-10 15:44:14 +01:00
aspangaro
47f63172e3 Fix: HRM index typo and presentation 2016-01-10 14:58:54 +01:00
Laurent Destailleur
70b57322a2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-10 13:05:35 +01:00
Laurent Destailleur
6685502d5c Fix add Croatia into list of country in EEC 2016-01-10 13:05:22 +01:00
Regis Houssin
694530bfae Fix: Gives the possibility to the module, to provide his own family info 
and position of this family. (canceled $this->family)
 2016-01-10 13:00:48 +01:00
Laurent Destailleur
94814e58e5 Merge pull request #4334 from olsesacl/patch-1 
Fix check userlocaltax1_rate and userlocaltax2_rate
 2016-01-10 11:51:26 +01:00
Laurent Destailleur
40f0d0c9f2 Merge pull request #4321 from fmarcet/3.7 
FIX: Email templates not compatible with Multicompany
 2016-01-10 11:49:37 +01:00
Laurent Destailleur
70ffcfea33 Merge pull request #4380 from aspangaro/3.9-p4 
Fix: Donation some problems with french article
 2016-01-10 11:46:12 +01:00
Laurent Destailleur
d8001a8e7a Merge pull request #4379 from aspangaro/3.9-p3 
Fix: SQL error on user bank tab
 2016-01-10 11:45:40 +01:00
Laurent Destailleur
ffe80a36e1 Merge pull request #4378 from aspangaro/3.9-p1 
Fix: Add missing key language for propal
 2016-01-10 11:43:54 +01:00
Laurent Destailleur
c22bc8a29e Merge pull request #4377 from aspangaro/3.9-p2 
Fix: Wrong language file for 2 menu entries in accountancy module
 2016-01-10 11:38:21 +01:00
Laurent Destailleur
aa0b002119 Fix #4354 2016-01-10 11:35:06 +01:00
Laurent Destailleur
fddd02eecc Complete fix #4354 2016-01-10 11:31:22 +01:00
aspangaro
965a96784c Fix: Donation some problems with french article 2016-01-10 07:35:00 +01:00
aspangaro
87f1e55bcb Fix: SQL error on user bank tab 2016-01-10 07:08:49 +01:00
aspangaro
af9e46d179 Fix: Wrong language file for 2 menu entries in accountancy module 2016-01-10 06:56:20 +01:00
aspangaro
e82f7761bc Merge remote-tracking branch 'Upstream/3.9' into 3.9-p1 2016-01-10 06:26:42 +01:00
Laurent Destailleur
2764fb240f Fix text color for category tags 
Fix banner for category translation tab
 2016-01-10 00:11:49 +01:00
aspangaro
3ff9fe3123 Fix: Add missing key language for propal 2016-01-09 08:26:08 +01:00
Laurent Destailleur
b2924885aa Fix css 2016-01-09 03:00:12 +01:00
Laurent Destailleur
a8758fa5b7 Bug war week-end: Fix a duplicate page on holiday, fix missing badge on 
some documents tabs.
 2016-01-09 01:54:46 +01:00
Laurent Destailleur
0d8788e552 FIX It was not possible to define if leave type need to be followed by a 
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
 2016-01-09 01:18:53 +01:00
Laurent Destailleur
e79750dc89 I continue bug war week-end 2016-01-09 00:44:06 +01:00
Laurent Destailleur
e5d0bc9d57 Fix permission not used 2016-01-09 00:34:15 +01:00
Laurent Destailleur
06c97b931b Fix css 2016-01-09 00:06:16 +01:00
Laurent Destailleur
37c106acff Fix search on shipment 2016-01-08 23:59:02 +01:00
Laurent Destailleur
99f3870ee6 Fix no picot if no warehouse set 
Fix search on warehouse
 2016-01-08 23:54:40 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to 
deal this.
 2016-01-08 23:17:45 +01:00
Laurent Destailleur
127354f0af Minor fixes 2016-01-08 22:41:30 +01:00
Laurent Destailleur
f9933aba0c Install style match application style 2016-01-08 22:23:57 +01:00
Laurent Destailleur
c9176cd6b4 Missing translation 2016-01-08 18:22:41 +01:00
Laurent Destailleur
de36db19bc Fix do not show warehouse for shipment on not predefined product 2016-01-08 18:15:53 +01:00
Laurent Destailleur
b6895c7c1f Fix: a badge css was found into an array 2016-01-08 17:23:25 +01:00
Laurent Destailleur
87c236b534 Fix when error creating invoice from predefined invoice, we must go back 
to create page from same predefined invoice.
 2016-01-08 16:30:43 +01:00
Laurent Destailleur
20f1455090 FIX #4314 2016-01-08 15:45:23 +01:00
Laurent Destailleur
2259cf2340 Merge remote-tracking branch 'origin/3.8' into develop 2016-01-08 14:49:00 +01:00
Laurent Destailleur
8366310f0f Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/agenda_extsites.php
 2016-01-08 14:47:46 +01:00
Laurent Destailleur
e008922919 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/admin/agenda_extsites.php
 2016-01-08 14:45:53 +01:00
Laurent Destailleur
5414cb6f12 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2016-01-08 14:43:20 +01:00
Laurent Destailleur
a26a6c2449 Fix sql injection even when code is on several lines 2016-01-08 14:43:04 +01:00
Laurent Destailleur
c2b8be9aaf Merge pull request #4355 from GPCsolutions/3.6-4291 
FIX #4291 Correctly filter external calendar GETPOSTs
 2016-01-08 14:23:56 +01:00
Laurent Destailleur
844e8bff83 Better fix for #4354 2016-01-08 14:22:21 +01:00
Laurent Destailleur
6a058edc23 Revert "Debug of module leave requests " 2016-01-08 14:15:22 +01:00
Laurent Destailleur
cce473b2cb Merge pull request #4354 from T-B-A-I/patch-1 
Debug of module leave requests
 2016-01-08 14:13:08 +01:00
Laurent Destailleur
d4aa83e7ca Merge pull request #4343 from grandoc/develop 
translations
 2016-01-08 14:07:05 +01:00
Laurent Destailleur
36dc8b1ce7 FIX #4341 2016-01-08 13:57:53 +01:00
Laurent Destailleur
5785744d5a Add ignore 2016-01-08 13:06:38 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late 
to use them. Will be done into 4.0
 2016-01-08 13:05:56 +01:00
Raphaël Doursenaud
f2178f0369 FIX #4291 Correctly filter external calendar GETPOSTs 2016-01-08 06:42:28 +01:00
TBAI
8c48785de7 Debug of module leave requests 
Add text in holiday module
 2016-01-07 20:10:22 +01:00
TBAI
f28ebefe93 Debug of module leave requests 
Cancel leave isn't possible if it has been validated
 2016-01-07 19:53:59 +01:00
TBAI
b2aa1f2115 Debug of module leave requests 
Cancel leave isn't possible if it has been validated
 2016-01-07 19:32:25 +01:00
Laurent Destailleur
3c5eaf87d5 Fix dol_fiche_head and end missing 2016-01-07 18:48:46 +01:00
Laurent Destailleur
0eae624a60 Add protection to avoid packaging external tested modules 2016-01-07 18:13:15 +01:00
Laurent Destailleur
befe58ab98 Fix selection of first entry into select 2016-01-07 13:44:19 +01:00
Laurent Destailleur
b3cb037abb Neutral color 2016-01-07 11:43:53 +01:00
Laurent Destailleur
4e2d4a6651 Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible. 
Solved this by completing tooltip info.
 2016-01-07 11:01:37 +01:00
philippe grand
7b7f2e9fed translations 2016-01-07 10:07:05 +01:00
Sergio Sanchis Climent
dfdf58051e Edited correctly for check values 2016-01-07 09:37:04 +01:00
fmarcet
d8360a2a01 FIX: Email templates not compatible with Multicompany 2016-01-07 08:18:36 +01:00
Laurent Destailleur
9d3afe45d3 Merge pull request #4340 from hregis/3.8_bug 
Fix: disable main.inc.php hooks
 2016-01-07 00:08:48 +01:00
Laurent Destailleur
b4d9f1bece Merge pull request #4338 from frederic34/patch-10 
FIX: Missing leave request type when calling function
 2016-01-07 00:07:29 +01:00
Laurent Destailleur
9200a4b69d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-07 00:05:39 +01:00
Laurent Destailleur
2945d2d171 Fix bad condition to show tabs 2016-01-07 00:05:28 +01:00
Laurent Destailleur
a974fa858d Merge pull request #4328 from frederic34/patch-8 
Indentation
 2016-01-06 18:51:55 +01:00
Laurent Destailleur
d6c5a73264 Fix missing payment fields definition in export 2016-01-06 17:37:01 +01:00
Regis Houssin
3ae5da1cd6 Fix: disable main.inc.php hooks 2016-01-06 16:18:52 +01:00
Frédéric FRANCE
4dacf462db Update card.php 2016-01-05 17:36:48 +01:00
Frédéric FRANCE
a0b3cdbd21 Update list.php 2016-01-05 17:33:54 +01:00
Sergio Sanchis Climent
ffd7f4ea30 Fix userlocaltax 
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no enter in if, now check if diferent 0 and now enter
 2016-01-05 09:47:14 +01:00
fmarcet
cafe148f72 FIX: Email templates not compatible with Multicompany 2016-01-04 09:12:27 +01:00
Laurent Destailleur
f6fead7403 Merge pull request #4317 from marcosgdf/bug-3798 
FIX #3798 #2519 Cron jobs would never be executed
 2016-01-03 19:36:58 +01:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
b2c41d8565 Fix search forms 2016-01-03 18:46:10 +01:00
Laurent Destailleur
abe3f192fa Debug and fix when using dolibarr with jmobile 2016-01-03 16:23:23 +01:00
Marcos García de La Fuente
ae2295d019 Improvement suggested by @eldy 2016-01-03 15:10:22 +01:00
Laurent Destailleur
96e5651ed5 Fix missing field on list. Restor ability to search on supplier ref. 2016-01-03 14:38:47 +01:00
Laurent Destailleur
d5fa91f7ba Fix several bugs in css and in jmobile usage 2016-01-02 20:48:19 +01:00
Frédéric FRANCE
998649d467 Indentation 2016-01-02 18:51:31 +01:00
Laurent Destailleur
d02c261d2e Fix perf test was using a not existing js file. 2016-01-02 18:13:41 +01:00
Laurent Destailleur
0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
 2016-01-02 12:27:08 +01:00
Laurent Destailleur
0cad938e09 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/install/upgrade.php
 2016-01-02 12:19:49 +01:00
Laurent Destailleur
b46aec8e7e Fix to allow phpunit of migration process for 3.5 to 3.6 2016-01-02 12:18:26 +01:00
Laurent Destailleur
35ce670bf2 Fix to allow phpunit of migration process for 3.4 to 3.5 2016-01-02 12:18:12 +01:00
Laurent Destailleur
5b305249a6 Merge pull request #4327 from braito4/patch-1 
FIX #4326 PHP7 Warning
 2016-01-02 11:56:54 +01:00
Laurent Destailleur
04c5516483 Fix the format "dayall" does not exists. Instead add missing format 
"_locale" using correct language file.
 2016-01-02 11:51:40 +01:00
braito4
9b3533e753 FIX #4326 PHP7 Warning 2016-01-02 11:42:43 +01:00
Laurent Destailleur
865d93b19e Merge pull request #4324 from defrance/patch-93 
Add rfc and dayall format for extrafields date
 2016-01-02 11:39:42 +01:00
Laurent Destailleur
273f3678bc Fix no ?> at end of php files 2016-01-02 00:32:22 +01:00
Laurent Destailleur
1ae4bef04b Fix conflict with the div #dialog used for popup cut and paste of 
address.
 2016-01-02 00:27:14 +01:00
Laurent Destailleur
a7b2f000d8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-01 23:44:35 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
BENKE Charlie
dbb8e49654 Update commondocgenerator.class.php 2016-01-01 12:47:27 +01:00
BENKE Charlie
b1aba4b93b Add rfc and dayall format for extrafields date 2015-12-31 18:50:28 +01:00
phf
fffc8a430d FIX call trigger LINEBILL_SUPPLIER_CREATE 2015-12-31 15:48:16 +01:00
Laurent Destailleur
2cbcbb8f85 Merge pull request #4319 from ParisLiakos/develop 
FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
 2015-12-31 15:04:16 +01:00
Laurent Destailleur
a234482d08 FIX #3694 2015-12-31 14:55:53 +01:00
Laurent Destailleur
c004342976 FIX #3694 2015-12-31 14:55:10 +01:00
Laurent Destailleur
bc56b9a2a7 Merge pull request #4313 from braito4/patch-2 
Fix Warning #4229 PHP7
 2015-12-31 14:48:50 +01:00
Laurent Destailleur
c63cbe34c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-31 12:02:36 +01:00
Laurent Destailleur
5a49b8ce53 Fix: error when running install twice 
Fix: a minor error was locking the full upgrade process.
 2015-12-31 12:02:22 +01:00
Juanjo Menent
3aba3eda3c Merge pull request #4316 from marcosgdf/bug-4272 
FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty
 2015-12-30 21:49:52 +01:00
Juanjo Menent
08b4903057 Merge pull request #4315 from marcosgdf/bug-4155 
FIX #4155 Search Categories error
 2015-12-30 21:49:25 +01:00
fmarcet
cebb996120 FIX: Email templates not compatible with Multicompany 2015-12-29 11:22:18 +01:00
fmarcet
f8e156ea30 FIX: Email templates not compatible with Multicompany 2015-12-29 10:35:10 +01:00
Paris Liakos
b6b422042c MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden 2015-12-29 03:43:49 +02:00
Sof
c04eef35d5 FIX: Field cost_price does not exist and typos 2015-12-28 19:07:25 +01:00
Marcos García de La Fuente
039039bb00 FIX #3798 #2519 Cron jobs would never be executed 2015-12-28 15:17:53 +01:00
Marcos García de La Fuente
bec00e37e0 FIX #4272 Error when trying to print the page "Linked objects" of a Thirdparty 2015-12-28 15:04:24 +01:00
Marcos García de La Fuente
5773171efc FIX #4155 Search Categories error 2015-12-28 14:04:37 +01:00
Laurent Destailleur
41516093bb Syn transifex 2015-12-28 12:21:24 +01:00
braito4
47ee8993d3 fix travis 2015-12-28 11:47:12 +01:00
braito4
07f7717b51 Fix Warning #4229 PHP7 2015-12-28 11:28:18 +01:00
Laurent Destailleur
ed3f0ce86b Fix totalnboflines not correctly managed 2015-12-28 00:20:48 +01:00
Laurent Destailleur
6905842794 Update list of module in demo with new 3.8 modules 2015-12-27 20:31:39 +01:00
Laurent Destailleur
6f474c403c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php
 2015-12-27 19:15:20 +01:00
Laurent Destailleur
e536e10269 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:06:31 +01:00
Laurent Destailleur
06754068ff Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
 2015-12-27 19:02:19 +01:00
Laurent Destailleur
96bc2023f3 Prepare package 3.6.6 2015-12-27 18:56:15 +01:00
Laurent Destailleur
40963f2f2a FIX #4207 2015-12-27 18:46:21 +01:00
Laurent Destailleur
bf15ff56e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-27 18:26:31 +01:00
Laurent Destailleur
0645938283 FIX #4230 PHP7 error 2015-12-27 18:26:21 +01:00
Laurent Destailleur
46d122c43a Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-12-27 18:20:58 +01:00
Laurent Destailleur
97030b05ce FIX #4281 2015-12-27 18:20:39 +01:00
Laurent Destailleur
5afed31265 Merge pull request #4305 from marcosgdf/bug-4036 
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
 2015-12-27 17:37:29 +01:00
Laurent Destailleur
80989fd2c9 Merge pull request #4304 from marcosgdf/bug-4302 
FIX #4302 Undefined variable $conf in Commande::LibStatut
 2015-12-27 17:37:02 +01:00
Laurent Destailleur
ff6dc32827 Merge pull request #4303 from marcosgdf/bug-4282 
FIX #4282 Defined shipping time were not shown in Customer order's PDF documents
 2015-12-27 17:36:48 +01:00
Laurent Destailleur
299e34f3ee Merge pull request #4294 from marcosgdf/bug-4287 
FIX #4287 SQL error when accessing an unexisting proposal
 2015-12-27 17:33:09 +01:00
Laurent Destailleur
e93ec106bc Merge pull request #4290 from defrance/patch-92 
add odt info function call if present in class
 2015-12-27 17:26:26 +01:00
Laurent Destailleur
a9b52f36e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-27 17:06:05 +01:00
Laurent Destailleur
c64eac5e72 Fix doc and mysql min version 2015-12-27 17:05:56 +01:00
Marcos García de La Fuente
ebdaf7dfa6 FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7 2015-12-27 15:12:02 +01:00
Marcos García de La Fuente
c40c695d20 FIX #4036 Direct printing module without any driver configured, shows an unformatted error message 2015-12-27 14:58:33 +01:00
Marcos García de La Fuente
98351d6fec FIX #4302 Undefined variable $conf in Commande::LibStatut 2015-12-27 13:15:05 +01:00
Marcos García de La Fuente
67bdfa2617 FIX #4282 Defined shipping time were not shown in Customer order's PDF documents 2015-12-27 13:10:33 +01:00
Regis Houssin
c65babf3b5 Merge remote-tracking branch 'origin/3.7' into 3.7_bug 2015-12-27 12:50:41 +01:00
bobby
e557c002c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-26 11:56:10 +01:00
Marcos García de La Fuente
686348a0d6 FIX #4287 SQL error when accessing an unexisting proposal 2015-12-25 11:47:48 +01:00
Marcos García
da959c5cf0 Little typo in commit 8b633ae 2015-12-25 11:32:13 +01:00
Juanjo Menent
c6093fff3e Merge pull request #4289 from marcosgdf/bug-4285 
FIX #4285 SQL query shown when accessing an unexisting invoice
 2015-12-24 22:00:00 +01:00
Juanjo Menent
d4466a652a Merge pull request #4288 from marcosgdf/bug-4182 
FIX #4182 SQL error when deleting an unexisting bank entry
 2015-12-24 21:59:16 +01:00
Juanjo Menent
cdd1641b66 Merge pull request #4284 from frederic34/patch-7 
typo
 2015-12-24 15:50:24 +01:00
BENKE Charlie
ed501cec46 add odt info is present in class 2015-12-24 15:44:56 +01:00
Juanjo Menent
b9d0fc5aaf Merge pull request #4271 from grandoc/develop 
[Qual] Uniformize code
 2015-12-24 15:43:14 +01:00
BENKE Charlie
9c78b083bd add display odt info if method present in class 2015-12-24 15:42:47 +01:00
Marcos García de La Fuente
de1625b9de FIX #4285 SQL query shown when accessing an unexisting invoice 2015-12-24 14:46:01 +01:00
Marcos García de La Fuente
8b633aee66 FIX #4182 SQL error when deleting an unexisting bank entry 2015-12-24 14:39:28 +01:00
Marcos García de La Fuente
d30c64413d FIX #4055 SQL error when trying to access a non-existing expedition 2015-12-24 14:27:12 +01:00
Laurent Destailleur
a4d5e022cf Fix pagination on limit failed when limit was forced on url 2015-12-24 12:52:11 +01:00
Laurent Destailleur
8c1f271356 Maxi debug of module leave requests. 2015-12-24 12:37:38 +01:00
Laurent Destailleur
66e0c1285e Disable a bugged box 2015-12-24 11:38:30 +01:00
Laurent Destailleur
74e8738ca7 Fix: if option to select thirdparties using a combo box after n chars 
was on, it was no more possible to clear the filter.
 2015-12-24 11:24:56 +01:00
Frédéric FRANCE
45b60c7800 typo 2015-12-24 00:01:05 +01:00
Laurent Destailleur
18fdb75c98 Missing global 2015-12-23 20:02:15 +01:00
Laurent Destailleur
a9db42ddc1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-23 20:00:16 +01:00
Laurent Destailleur
559e621fd2 Fix conflict with trigger to delete payment customer and supplier. 2015-12-23 19:54:56 +01:00
Laurent Destailleur
2d3915b88c Fix hook implementation on some thirdparty pages 2015-12-23 14:31:42 +01:00
Florian HENRY
930eb6dccf FIX : bug with head.lib.js if MAIN_MAX_DECIMALS_SHOWN use ... 
FIX : List of supplier order to invoice must use billed new column
 2015-12-23 14:15:30 +01:00
Florian HENRY
9441d98890 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-23 14:01:16 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
philippe grand
5e3c89fdbd [Qual] Uniformize code 2015-12-21 22:59:12 +01:00
Juanjo Menent
442006dba5 Merge pull request #4265 from grandoc/develop 
[Qual] Uniformize code
 2015-12-21 20:59:25 +01:00
Laurent Destailleur
6b25439161 Fix vietnamesefont 2015-12-21 20:41:02 +01:00
Laurent Destailleur
a1990f4c63 Fix css md theme 2015-12-21 17:34:21 +01:00
Laurent Destailleur
ad5f65e988 Fix: use the mini image on tooltip of thirdparties 2015-12-21 17:32:57 +01:00
Laurent Destailleur
dcbad8bb15 Fix delete of image 2015-12-21 17:32:20 +01:00
philippe grand
c740a85006 [Qual] Uniformize code 2015-12-21 14:43:21 +01:00
philippe grand
8e8c6b1534 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-12-21 14:22:45 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
Florian HENRY
8006baf592 ry 2015-12-21 13:09:22 +01:00
Laurent Destailleur
536413523a Fix to show ref of linked object on documents. Fix is not complete but 
stable.
 2015-12-21 12:52:10 +01:00
Laurent Destailleur
fec5f4e20b Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:40:32 +01:00
Laurent Destailleur
0a515ca8c0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:38:23 +01:00
Laurent Destailleur
932c3f9172 Fix init of situation_percent 2015-12-21 12:37:58 +01:00
Laurent Destailleur
7e03aaee23 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	composer.json
	htdocs/product/ajax/products.php
	htdocs/product/class/product.class.php
 2015-12-21 12:24:24 +01:00
Laurent Destailleur
b179a193dd Fix param for username is $username and not $login 2015-12-21 03:01:37 +01:00
Laurent Destailleur
a2ae9b9cfc Fix forget password page must have a different title then login page 
Fix Missing translations
 2015-12-21 00:47:44 +01:00
Laurent Destailleur
2f8fc05cdb Fix: QRcode must not be random 2015-12-20 21:28:05 +01:00
Laurent Destailleur
f243b5230f Fix search filter disappear and clean filter button not visible. 2015-12-20 20:24:12 +01:00
Laurent Destailleur
fa277ef634 Fix duplicate translation 2015-12-20 20:11:29 +01:00
philippe grand
7a33e2983d [Qual] Uniformize code 2015-12-20 10:36:20 +01:00
Laurent Destailleur
f0802eb36b FIX #4245 PHP 7 2015-12-19 19:48:36 +01:00
Laurent Destailleur
1c1d176715 Fix statistics was reporting bad value 2015-12-19 19:39:42 +01:00
Laurent Destailleur
065b7b6683 Fix ba alignement 2015-12-19 19:12:21 +01:00
Laurent Destailleur
55e90c5676 Try to restore lost file 2015-12-19 18:35:17 +01:00
Laurent Destailleur
f5c5dfd37f FIX #4185 2015-12-19 18:26:15 +01:00
Laurent Destailleur
3517b64031 FIX #4228 PHP7 error 2015-12-19 18:18:24 +01:00
Laurent Destailleur
9334cf8fd1 FIX #4243 sql injection 2015-12-19 18:03:08 +01:00
Laurent Destailleur
ba9796a438 Merge pull request #4082 from atm-maxime/fix_situation_percent 
Fix : situation percent should be 100 by default
 2015-12-19 17:49:04 +01:00
Laurent Destailleur
3b2a921378 Fix a serial is required for stock change 2015-12-19 14:05:38 +01:00
Laurent Destailleur
d7e9c92144 Fix bad link on category 
Fix cancel button on categories
Css enhancement.
 2015-12-19 13:55:27 +01:00
Laurent Destailleur
50e496712e missing css style 2015-12-19 03:47:02 +01:00
Laurent Destailleur
bef971cacf Fix ergonomy. Adding a new entry is done from left menu. 2015-12-19 03:43:45 +01:00
Laurent Destailleur
b1051c7396 Fix picto 2015-12-19 03:30:35 +01:00
Laurent Destailleur
a4edd90320 Debug the cron module 2015-12-19 03:27:55 +01:00
Laurent Destailleur
a973c91c24 Fix pagination on cron jobs 
Fix perf when too much lines
 2015-12-19 02:39:44 +01:00
Laurent Destailleur
bd91f327b8 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/filefunc.inc.php
 2015-12-19 01:38:22 +01:00
Laurent Destailleur
298396a57e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	test/phpunit/AllTests.php
 2015-12-19 01:27:19 +01:00
Laurent Destailleur
0df45f10c1 Fix travis 2015-12-19 01:09:42 +01:00
Laurent Destailleur
a136e90749 Fix travis 2015-12-19 01:06:11 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-18 22:12:03 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
 2015-12-18 21:20:12 +01:00
Laurent Destailleur
ebf68ecbe0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	.travis.yml
	htdocs/contrat/class/contrat.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/project/pdf/pdf_baleine.modules.php
 2015-12-18 21:03:57 +01:00
Laurent Destailleur
dc9c5ed5ef Enhance transifex sync 2015-12-18 18:25:09 +01:00
Laurent Destailleur
1b67a9faf1 Merge pull request #4262 from atm-ph/fix_3.8_create_order_from_propal 
FIX label of line is set in description field if empty
 2015-12-18 18:21:20 +01:00
Laurent Destailleur
484dc5937b Fix regression in sorting 2015-12-18 18:05:07 +01:00
Laurent Destailleur
43044bbb4f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-18 17:32:54 +01:00
Laurent Destailleur
eaacfabdf6 Merge pull request #4261 from hregis/3.8_bug 
Fix: Disable "main.inc.php" hooks with ajax return
 2015-12-18 17:32:45 +01:00
Laurent Destailleur
4998516835 Code comment 2015-12-18 17:31:50 +01:00
Laurent Destailleur
724817b966 Merge pull request #4259 from aschio/develop_sunimport 
Adding extrafields to shipments module
 2015-12-18 17:28:35 +01:00
Laurent Destailleur
dc8e5f45ae Merge pull request #4254 from grandoc/develop 
[Qual] Uniformize code
 2015-12-18 17:13:22 +01:00
phf
c215898c52 FIX label of line is set in description field if empty 2015-12-18 17:11:14 +01:00