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
philippe grand
74601a0b1d fix : missing translation 2016-03-03 16:01:50 +01:00
philippe grand
9e80a37947 fix : missing translation 2016-03-03 15:45:42 +01:00
philippe grand
9f798bc3fc fix : missing translation 2016-03-03 11:54:12 +01:00
Regis Houssin
6fd5334812 Fix: compatibility with multicompany transversal mode and more security 
issue
 2016-03-03 10:10:55 +01:00
Regis Houssin
25686e82c9 Fix: best compatibility with multicompany and others security issue 2016-03-03 08:49:24 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/admin.lib.php
 2016-03-02 23:07:42 +01:00
philippe grand
59c4559a78 fix : missing translation 2016-03-02 21:13:12 +01:00
Laurent Destailleur
7fbfbfc804 Merge pull request #4716 from marcosgdf/bug-4453-2 
FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field
 2016-03-02 20:59:08 +01:00
Laurent Destailleur
f7059d3490 Merge pull request #4712 from marcosgdf/bug-4434 
FIX #4434 Weird behaviour when enabling multiprices
 2016-03-02 20:56:03 +01:00
Laurent Destailleur
e50ab89bcd Merge pull request #4711 from marcosgdf/bug-4425 
FIX #4425 Missing "VAT" translation in supplier order popup
 2016-03-02 20:55:21 +01:00
Marcos García de La Fuente
6f5481896b FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in RmtInf field 
Close #4453
 2016-03-02 12:41:24 +01:00
Marcos García de La Fuente
7d336bd5d4 FIX #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property 
Close #4414
 2016-03-02 11:43:55 +01:00
Marcos García de La Fuente
aa45734683 FIX #4434 Weird behaviour when enabling multiprices 
Close #4434
 2016-03-02 11:38:40 +01:00
Marcos García de La Fuente
123d6fb6e5 FIX #4425 Missing "VAT" translation in supplier order popup 
Close #4425
 2016-03-02 11:29:42 +01:00
Regis Houssin
057188e1de Fix: comment debug lines 2016-03-02 11:26:43 +01:00
Regis Houssin
e9ac41fb24 Fix: issue during upgrade of MAIN_VERSION_LAST_UPGRADE (rc -> rc2) 2016-03-02 11:23:57 +01:00
Marcos García de La Fuente
e63ab857d8 FIX #4583 Incorrect call of Categories::containing throws a DoliDB error 
Close #4583
 2016-03-02 11:21:56 +01:00
Laurent Destailleur
215b24df54 Merge pull request #4701 from atm-alexis/FIX_contract_fourn_price_deleted_on_update 
FIX contract line supplier data were deleted on update
 2016-03-02 01:04:39 +01:00
Laurent Destailleur
d39dca21d7 Add franc guinéen in currency 2016-03-01 22:48:35 +01:00
Alexis Algoud
72b532b7eb FIX non instanciated values 2016-03-01 11:31:27 +01:00
Laurent Destailleur
839b2074ce Merge pull request #4696 from aspangaro/3.9-p14 
Fix: 3.9rc2 Use getNomUrl to show account_parent instead of rowid of the accountancy account
 2016-03-01 01:47:56 +01:00
Laurent Destailleur
724f06a5eb Merge pull request #4694 from simnandez/3.9 
FIX : Remove bad migration file for this version
 2016-03-01 01:47:09 +01:00
Laurent Destailleur
2d6c2d4fa5 Merge pull request #4698 from fmarcet/3.8 
FIX: Status filter don't work
 2016-03-01 01:46:26 +01:00
Laurent Destailleur
a26f880843 Fix missing declarion of form 
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
 2016-03-01 00:59:42 +01:00
Frédéric FRANCE
10d04e63c1 Update bonprelevement.class.php 2016-02-29 22:59:08 +01:00
Laurent Destailleur
846d78dfba FIX Edition of delay (nb of days) for payment term "Immediate" was 
broken.
 2016-02-29 15:43:00 +01:00
Laurent Destailleur
a3d4340b82 Fix useless truncation 2016-02-29 15:30:52 +01:00
Laurent Destailleur
64374bec00 Fix avoid wrapping in select2 combo list 2016-02-29 15:28:06 +01:00
Florian HENRY
50decb35cd Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-29 11:11:37 +01:00
Laurent Destailleur
2eaa21ea5c Fix minor css error (pixel size must have "px"). Compatibility with old 
behaviour.
 2016-02-29 10:50:52 +01:00
Laurent Destailleur
d2c71fbf8f Fix alias name was visible twice. 2016-02-29 10:35:18 +01:00
Laurent Destailleur
21c7aacddb Fix add hidden option INVOICE_DEFAULT_UNPAYED_SORT_ORDER to be able to 
provide backward compatibility with old behaviour.
 2016-02-29 10:29:32 +01:00
fmarcet
77490bff71 FIX: Status filter don't work 2016-02-29 10:07:48 +01:00
Laurent Destailleur
4b28dadd6e More complete instruction to convert image to theme 2016-02-28 14:44:09 +01:00
Laurent Destailleur
b7e0faa332 More complete css 2016-02-28 14:01:21 +01:00
Laurent Destailleur
be9a144433 FIX Add a test to show bugged module with a bad declaration of 
dictionaries to avoid to see clean module to be breaked.
 2016-02-28 12:43:00 +01:00
Laurent Destailleur
39d6d16c02 Fix bad picto "shared project" 2016-02-27 19:20:11 +01:00
Laurent Destailleur
6b7551c5d2 Fix: Introduce hidden option to disable feature than hangs when too much 
data
 2016-02-27 19:12:45 +01:00
Laurent Destailleur
193699a1b3 Fix duration format 2016-02-27 18:47:02 +01:00
Laurent Destailleur
d644a3bc43 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-02-27 18:43:50 +01:00
Laurent Destailleur
1038e92354 FIX sql request and total for time spen for current month 2016-02-27 18:42:57 +01:00
Laurent Destailleur
5453f99e2e Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
 2016-02-27 18:33:39 +01:00
Laurent Destailleur
15503f12b9 FIX Removed a bugged list. Fixed another one to not count data of 
previous year.
 2016-02-27 18:29:01 +01:00
Laurent Destailleur
526ea743e0 Fix: the view my task must show only task you are assigned to 2016-02-27 17:56:59 +01:00
aspangaro
0136a1742e Spaces !!! 2016-02-27 16:21:59 +01:00
aspangaro
ba6dadb6fa Fix: Use getNomUrl to show account_parent instead of rowid of the account 2016-02-27 16:21:40 +01:00
Laurent Destailleur
9b308b9f68 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-27 15:50:18 +01:00
Laurent Destailleur
4dd50460d3 Fix MAIN_THIRDPARTY_CREATION_INDIVIDUAL syntax error in name 2016-02-27 15:50:06 +01:00
aspangaro
1bf188db86 Fix: Double line 2016-02-27 14:34:32 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Juanjo Menent
cf932d6124 Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-02-27 09:45:40 +01:00
Juanjo Menent
486488795a FIX : Remove bad migration file for this version 2016-02-27 09:44:48 +01:00
Juanjo Menent
2af7d3a635 Merge pull request #4693 from simnandez/3.9 
NEW : Add Malta VAT into 3.9
 2016-02-27 09:42:44 +01:00
Juanjo Menent
77173344fe NEW : Add Malta VAT into 3.9 2016-02-27 09:36:09 +01:00
aspangaro
7233adcede Merge remote-tracking branch 'Upstream/3.9' into 3.9-p13 2016-02-27 08:25:42 +01:00
aspangaro
c907cd139c Lot of corrections 2016-02-27 08:15:58 +01:00
aspangaro
41fb60e4a2 Fixed: comestic correction of company card 2016-02-27 06:38:48 +01:00
Juanjo Menent
c2c6d77caa FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:43:25 +01:00
Juanjo Menent
b34459c949 FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:31:36 +01:00
Juanjo Menent
7691e8c018 FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:17:22 +01:00
Laurent Destailleur
4cf59d3f9b Fix if option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER is on, we must 
not show unpaid orders.
 2016-02-26 19:13:25 +01:00
Laurent Destailleur
9a0af064bf Prepare rc2 2016-02-26 19:05:02 +01:00
Laurent Destailleur
4250fe155a Fix showing ref of shipment on orders (lines too long) 2016-02-26 15:42:07 +01:00
fmarcet
30d6aa0b96 FIX: Some filters are lost when paging 2016-02-26 13:14:23 +01:00
Laurent Destailleur
2e25c7969b Fix when setting a price for a product, selection of product must not 
show any price
 2016-02-26 12:22:32 +01:00
Florian HENRY
9ef5d02459 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-02-26 11:19:10 +01:00
Laurent Destailleur
7567336680 FIX #4683 2016-02-26 10:51:06 +01:00
Laurent Destailleur
b072b5a181 Fix remove some warnings 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-02-26 10:45:25 +01:00
Laurent Destailleur
cdcad62967 FIX Array of linked elements for PDF contains duplicates and missing 
data
 2016-02-25 18:19:20 +01:00
Laurent Destailleur
59a6cb5f55 Fix bad support of option WORKFLOW_BILL_ON_SHIPMENT 
Conflicts:
	htdocs/commande/list.php
 2016-02-25 03:06:37 +01:00
Laurent Destailleur
a5c3658f53 Fix bad formatting of order / shipment ref on PDF 2016-02-25 02:45:27 +01:00
Laurent Destailleur
773e5e3b0a Fix: specific contact of object were lost when used to create invoice. 2016-02-25 01:03:37 +01:00
Laurent Destailleur
4b89b0b7aa Fix bad status translation for shipment 2016-02-24 22:13:29 +01:00
Laurent Destailleur
33d5fa38ef Fix pdfBuildThirdpartyName must return main name. Alias should be an 
option.
 2016-02-24 13:30:16 +01:00
Laurent Destailleur
490ef11eb5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-24 12:10:35 +01:00
Laurent Destailleur
5d1241be2f Sync transifex 2016-02-24 12:10:25 +01:00
Laurent Destailleur
ac6001cec8 Fix do not show warning if account defined 2016-02-23 12:44:46 +01:00
Juanjo Menent
6db0f01fa4 FIX : Bad Argentina provences 2016-02-22 19:53:39 +01:00
Laurent Destailleur
cfdaa0e13c Fix missing translation 
Fix import of state
 2016-02-22 14:49:30 +01:00
Laurent Destailleur
d128df1fe5 Fix js error .submit is not a function 2016-02-22 14:33:14 +01:00
Laurent Destailleur
dcdc53464d Fix select2 text color 2016-02-22 14:25:12 +01:00
Laurent Destailleur
8e83f4f15c Fix missing translation load 2016-02-22 13:52:01 +01:00
Laurent Destailleur
a08fa814ec Better filter to exclude mysqldump warning 2016-02-22 13:32:01 +01:00
Laurent Destailleur
762ab060e4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 13:28:18 +01:00
Laurent Destailleur
355f091246 FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE 2016-02-22 13:28:08 +01:00
Laurent Destailleur
6181ab4149 FIX Avoid to return an error due to mysql warning 2016-02-22 09:32:42 +01:00
Laurent Destailleur
e7e6957073 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 09:27:53 +01:00
Laurent Destailleur
a4f189eea7 Fix do not show warning if account defined 2016-02-22 09:27:18 +01:00
Laurent Destailleur
93b1b4c66e FIX #4580 2016-02-21 21:02:25 +01:00
Laurent Destailleur
54a4570b5f FIX #4580 2016-02-21 20:57:15 +01:00
Laurent Destailleur
110c5b537a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-21 20:04:18 +01:00
Laurent Destailleur
c1d7f5a7ed FIX #4633 2016-02-21 20:00:40 +01:00
philippe grand
6f6f2a0574 enhance code help translation 2016-02-20 11:18:02 +01:00
Laurent Destailleur
7def330f54 Fix missing error message and input lost in shipment create page 2016-02-20 03:58:52 +01:00
Laurent Destailleur
2e27319d1b Fix Removed not expected br 2016-02-20 03:42:29 +01:00
Laurent Destailleur
a2817049c9 Fix must show warning only if threshold defined. 2016-02-20 03:34:56 +01:00
Ion Agorria
fc8f1272d2 Fix line fetch not converting dates 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2016-02-20 02:34:01 +01:00
Laurent Destailleur
7ff8c2c3db FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:31:42 +01:00
Laurent Destailleur
12e6b52131 Merge pull request #4654 from aspangaro/3.9-p12 
Fixed: Members - Problem of tab & missing language file
 2016-02-20 02:28:48 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
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