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

56669 Commits

Author SHA1 Message Date
ATM-Nicolas
60f8ca1283 Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_order_line_fk_multicurrency 2018-03-05 09:03:20 +01:00
fappels
1a7c09b7d5 Fix 0 is also a valid Qty 
Fix error handling
 2018-03-04 12:35:32 +01:00
Alexandre SPANGARO
c0664474e4 Fix : Missing language file 2018-03-04 06:32:55 +01:00
Laurent Destailleur
44eb50c424 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:57:10 +01:00
Laurent Destailleur
eac1b2efe9 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:23:23 +01:00
Regis Houssin
0c52977027 Fix: avoid Warning: A non-numeric value encountered 2018-03-03 08:37:44 +01:00
Regis Houssin
647331876b Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug5 2018-03-02 19:02:08 +01:00
Regis Houssin
b69d2800ef Fix: check if file name already exists 2018-03-02 18:59:30 +01:00
Laurent Destailleur
b24259ed46
Merge pull request #8265 from hregis/7.0_bug5 
Fix: missing hook during rename file action
 2018-03-02 18:15:01 +01:00
Regis Houssin
8e85198bd1 Fix: missing $upload_dir 2018-03-02 18:09:06 +01:00
Laurent Destailleur
4137e1cc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-02 17:56:30 +01:00
Laurent Destailleur
6bb91dd5d2 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-02 17:54:42 +01:00
Laurent Destailleur
d35c5282d4
Merge pull request #8245 from enstentechnologies/7.0 
FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php
 2018-03-02 17:52:23 +01:00
florian HENRY
3490d3779b Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-02 17:31:39 +01:00
florian HENRY
473c16ede5 fix pgSQL install 2018-03-02 17:30:46 +01:00
Regis Houssin
bf4543a636 Fix: missing hook during rename file action 2018-03-02 17:05:52 +01:00
Laurent Destailleur
b87db9d32d Fix missing ; 2018-03-02 16:38:56 +01:00
Laurent Destailleur
8d11f1efa1 FIX Payment mode not correctly set in donation and document 2018-03-02 12:32:49 +01:00
Laurent Destailleur
a01287b211 Fix template donation 2018-03-02 12:25:43 +01:00
Laurent Destailleur
c478ab952f Fix block to generate donation document missing 2018-03-02 11:57:39 +01:00
Laurent Destailleur
a815326a28 Fix filters on bank entry list 2018-03-01 12:37:03 +01:00
Laurent Destailleur
54edd51847 Fix look and feel v7 2018-03-01 12:07:19 +01:00
Laurent Destailleur
822dd4778c Fix info in tooltip 2018-03-01 12:03:50 +01:00
Laurent Destailleur
0e7a250060 Fix colspan 2018-03-01 11:53:18 +01:00
Laurent Destailleur
d25270a6f4 Fix ref not visible in payment link 2018-03-01 11:53:02 +01:00
Laurent Destailleur
bc04b3ee27 Fix min decimal on amount in payment page 2018-03-01 11:52:50 +01:00
Laurent Destailleur
be3e8a0e2d FIX Look and feel v7 2018-03-01 11:52:41 +01:00
Laurent Destailleur
ee4fcba4f2 Fix class not found 2018-02-27 22:11:11 +01:00
Laurent Destailleur
ee488ed83e FIX invoice creation fails when next date not defined 2018-02-27 20:24:50 +01:00
Laurent Destailleur
8b9e196478 Fix trans 2018-02-27 20:24:29 +01:00
Laurent Destailleur
75cbc466d5 Fix warning 2018-02-27 19:08:38 +01:00
Laurent Destailleur
1907b9c52d Fix search on dates on template invoices 2018-02-27 19:04:21 +01:00
Laurent Destailleur
bca2927da0 FIX css border missing 2018-02-27 19:03:42 +01:00
gauthier
4d05bff780 FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back 2018-02-27 12:27:25 +01:00
ATM-Nicolas
27100df927 FIX : Avoid empty value to fk_multicurrency attribute 2018-02-27 11:06:11 +01:00
Laurent Destailleur
7d3162313e FIX Temporary dir for mail files must be cleaned at beginning of form 2018-02-27 10:59:26 +01:00
Laurent Destailleur
0cc84ab92f FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
Laurent Destailleur
fd1d900f7f FIX: Properties updated if update successfull. 
Conflicts:
	htdocs/contrat/class/contrat.class.php
 2018-02-26 21:20:31 +01:00
Laurent Destailleur
229ee5c12f Fix search criteria lost 2018-02-26 12:32:56 +01:00
vabeltran
604cc5896e FIX Unknown column 'pl.amount_requested' in compta/prelevement/factures.php 
Column 'amount_requested' in ORDER clause not exists because that column is called 'amount' now in 'prelevement_bons' table in db.
 2018-02-26 12:31:40 +01:00
Laurent Destailleur
d1e846385a FIX Useless clean of tree 2018-02-26 12:01:36 +01:00
Laurent Destailleur
667c9045a2 FIX duplicate confirm message. Missing reposition class 2018-02-26 10:33:39 +01:00
Laurent Destailleur
4866d63ece Fix method getListOfPayments in the wrong class 2018-02-26 09:45:15 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
1666f371bf css 2018-02-26 00:13:16 +01:00
Laurent Destailleur
7ff94c88bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-25 15:00:31 +01:00
Laurent Destailleur
251136bebf Fix PHPUnit 2018-02-25 15:00:14 +01:00
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity 
FIX missing object entity in fetch
 2018-02-25 12:59:38 +01:00
Laurent Destailleur
68e0283fe4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-25 12:58:32 +01:00
Laurent Destailleur
0a571a0677 Complete fix #8230 2018-02-25 12:58:17 +01:00
Laurent Destailleur
0262b64eb1
Merge pull request #8230 from hregis/7.0_bug4 
Fix: missing hook parameters
 2018-02-25 12:56:43 +01:00
Laurent Destailleur
898f2cf0ca
Merge pull request #8229 from hregis/7.0_bug3 
FIX Parameter must be an array or an object that implements Countable
 2018-02-25 12:55:54 +01:00
Laurent Destailleur
7dfedbf35c
Merge pull request #8228 from hregis/7.0_bug 
FIX Use of undefined constant _ROWS_2
 2018-02-25 12:55:17 +01:00
Laurent Destailleur
6c16f2af1e
Merge pull request #8226 from hregis/7.0_multicompany 
Fix: differentiate sharing of "member" and "member_type"
 2018-02-25 12:54:51 +01:00
Laurent Destailleur
4581d6049c
Update societecontact.php 2018-02-25 12:52:39 +01:00
Laurent Destailleur
64dd6439e7
Merge pull request #8223 from atm-florian/6.0 
fix bad link invoice URL into acoutantcy customer affectation
 2018-02-25 12:42:03 +01:00
Laurent Destailleur
8dceb8930f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/user/card.php
 2018-02-25 12:41:17 +01:00
Laurent Destailleur
286d62edb8
Merge pull request #8221 from ATM-Marc/FIX_usercard_columns 
FIX: solve column mismatch in user card with multicompany transverse mode + code cleanup
 2018-02-25 12:35:05 +01:00
Rui Strecht
7b448a2d18 Fixed issue with elementarray null if num_rows = 0 2018-02-25 12:29:15 +01:00
Laurent Destailleur
c698558d9e
Merge pull request #8212 from simnandez/6.0 
Fix: Not showing link to ad event if module is disabled
 2018-02-25 12:28:06 +01:00
Laurent Destailleur
b20ae45265
Merge pull request #8210 from atm-john/fix_sql_entity 
Fix sql entity for sub query
 2018-02-25 12:27:35 +01:00
Laurent Destailleur
6a78ce65e9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/imports/import.php
 2018-02-25 12:21:10 +01:00
Laurent Destailleur
2d252e85e6 FIX Import process must stop after ending line nb to import 2018-02-25 12:15:36 +01:00
Regis Houssin
703d976b3b Fix: missing object entity in fetch 2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214 Fix: missing hook parameters 2018-02-24 15:01:29 +01:00
Regis Houssin
3859b5a926 Fix: Parameter must be an array or an object that implements Countable 2018-02-24 14:20:53 +01:00
Laurent Destailleur
a5b1f114c2 FIX Generic substitution of constant disabled for sensitive constant 2018-02-24 14:03:32 +01:00
Laurent Destailleur
619e0d3792 FIX Bad var for substitution of free text 2018-02-24 14:03:27 +01:00
Regis Houssin
5ecbe2ae81 Fix: Use of undefined constant _ROWS_2 2018-02-24 13:49:30 +01:00
Laurent Destailleur
03d9bf1376 Restore deprecated var 2018-02-24 12:35:36 +01:00
Laurent Destailleur
cbfe241c1b FIX Can use odx templates that does not include lines tags 2018-02-24 12:34:15 +01:00
Laurent Destailleur
435e4823a5 Fix some warning during install 2018-02-24 11:58:09 +01:00
Regis Houssin
4c06384197 Fix: differentiate sharing of "member" and "member_type" 2018-02-24 11:13:14 +01:00
Laurent Destailleur
812911bd44 Fix type of expense report output in PDF 2018-02-23 15:33:42 +01:00
Laurent Destailleur
953001c7ab Fix bad naming of column 2018-02-23 15:16:49 +01:00
atm-ph
d300b943e1 Fix wrong price on supplier order line 2018-02-23 15:10:25 +01:00
florian HENRY
b4b185abe0 fix bad link invoice URL into acoutantcy customer affectation 2018-02-23 14:42:52 +01:00
Marc de Lima Lucio
36cc1c6ca9 FIX: solve column mismatch in user card's usergroup list + code cleanup 2018-02-23 11:59:22 +01:00
Laurent Destailleur
f7ecac8734 Fix look and feel v7 2018-02-23 11:40:56 +01:00
Laurent Destailleur
194f5a2cef Fix substitution key 2018-02-23 11:03:48 +01:00
Laurent Destailleur
3f9a9f20ce Fix missing substitution key 2018-02-22 17:06:18 +01:00
Laurent Destailleur
bc0993d6cd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-22 12:17:25 +01:00
Laurent Destailleur
479c4b4d77 Fix look and feel v7 2018-02-22 12:15:11 +01:00
Laurent Destailleur
51cfb9795e Fix bad picto 2018-02-22 11:26:41 +01:00
Juanjo Menent
1d6baf5f2b Fix: Not showing link to ad event if module is disabled 2018-02-22 10:16:53 +01:00
Laurent Destailleur
9114a28e88 Fix: missing the reposition 2018-02-21 22:43:25 +01:00
John
b276a8186e Fix sql entity for sub query 2018-02-21 10:03:04 +01:00
Laurent Destailleur
34135e0a13 Fix extrafield date or datetime with bad timezone 2018-02-20 19:20:47 +01:00
Laurent Destailleur
48d250b201 Help to understand 2018-02-20 15:55:58 +01:00
Laurent Destailleur
7f419a29e7
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill 
fix the bill replacement with discounts #8028
 2018-02-20 15:19:19 +01:00
Laurent Destailleur
01c2971f4f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 15:08:17 +01:00
Laurent Destailleur
9690e68bfb
Merge pull request #8206 from fmarcet/5.0 
Fix: Barcode type on massive init
 2018-02-20 15:07:53 +01:00
Laurent Destailleur
f207e91643 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/holiday/define_holiday.php
	htdocs/main.inc.php
	htdocs/societe/class/societe.class.php
 2018-02-20 15:06:41 +01:00
Laurent Destailleur
b8736f5103 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:59:40 +01:00
Laurent Destailleur
6c8e7494f0
Merge pull request #8200 from atm-maxime/fix_contact_tooltiip 
Fix contact tooltip
 2018-02-20 14:56:06 +01:00
Laurent Destailleur
67ee443b34 Fix can set holiday remaining to 0 2018-02-20 14:53:19 +01:00
Laurent Destailleur
b361877ea8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-20 12:48:28 +01:00
Laurent Destailleur
4056b87a74 Fix syntax error 2018-02-20 12:36:03 +01:00
Laurent Destailleur
7321829732 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 12:34:15 +01:00
Laurent Destailleur
ea071b7680 Fix can't delete holiday refused 2018-02-20 12:31:26 +01:00
Laurent Destailleur
16fca2ee35 Fix bad link 2018-02-20 10:05:11 +01:00
Laurent Destailleur
87a3019e73 Fix upgrade missing steps 2018-02-20 06:03:22 +01:00
Laurent Destailleur
aa1ede6f74 FIX Search criteria on vat 2018-02-20 06:03:08 +01:00
Laurent Destailleur
cb644665bd Fix output dir of grab 2018-02-20 06:02:53 +01:00
Ferran Marcet
671b4a399d Fix: Barcode type 2018-02-19 17:47:24 +01:00
Ferran Marcet
2e1727e323 Fix: Barcode type 2018-02-19 17:45:19 +01:00
Ferran Marcet
5535daf84a Merge branch '5.0up' into 5.0 2018-02-19 17:43:14 +01:00
sschwebel
7c583227fb FIX: #8139 2018-02-19 10:58:05 +01:00
Laurent Destailleur
46c941c823 Translation 2018-02-16 23:57:35 +01:00
Laurent Destailleur
5c5d2cbefa Fix smtp warning message 2018-02-16 23:49:08 +01:00
Laurent Destailleur
9bed2ce8e2 Fix ignore file integrity check on filefunc.inc.php for deb/rpm package 2018-02-16 22:03:13 +01:00
Laurent Destailleur
a4b155fc91 Fix typo and 2018-02-16 20:42:40 +01:00
Laurent Destailleur
c513ffe1f7 Fix debian package 2018-02-16 18:21:18 +01:00
Laurent Destailleur
f67f0df609 Fix preview link not visible with long file names 2018-02-16 12:11:39 +01:00
John
49bad95d31 fix method exist test 2018-02-15 17:04:27 +01:00
John
63987fa32e fix invoice extrafield transmition to credit 2018-02-15 16:39:47 +01:00
Laurent Destailleur
47713e0264 Fix bug reported by scrutinizer 2018-02-15 15:32:43 +01:00
Laurent Destailleur
8493d9f62e FIX #8163 2018-02-15 15:27:06 +01:00
Maxime Kohlhaas
bfd46f62ea Fix : contact and user getnomurl needs all info to display tooltip correctly 2018-02-15 15:18:25 +01:00
Maxime Kohlhaas
6fe69d4a60 Wrong field in thirdparty getnomurl 2018-02-15 15:17:59 +01:00
Laurent Destailleur
13dd440fd4 FIX #8192 2018-02-15 14:47:08 +01:00
Laurent Destailleur
7722f004c8 FIX #8153 2018-02-15 14:08:42 +01:00
Laurent Destailleur
5eee292663 FIX #8189 2018-02-15 13:40:17 +01:00
Laurent Destailleur
825a295294 FIX #8198 2018-02-15 13:28:15 +01:00
Laurent Destailleur
f0855da0fb Fix responsive 2018-02-15 12:57:04 +01:00
Laurent Destailleur
a4384b1921 Fix date start/end of project are day not hours 2018-02-15 02:02:32 +01:00
Laurent Destailleur
18acff5e57 Fix avoid error when homepage not set 2018-02-15 01:29:51 +01:00
Laurent Destailleur
dde5c186e7 Fix duplicate html tag 2018-02-15 00:53:03 +01:00
Laurent Destailleur
b789a50ce6 Fix duplicate html tag 2018-02-15 00:38:11 +01:00
Laurent Destailleur
bab5c41b98 Fix duplicate html tag 2018-02-15 00:24:15 +01:00
Laurent Destailleur
0fc302fe98 Sync transifex 2018-02-15 00:06:43 +01:00
Laurent Destailleur
b515448bbd Fix delete when no extrafields used 2018-02-15 00:01:25 +01:00
Laurent Destailleur
5f0f9ff326 Fix delete page 2018-02-14 23:57:57 +01:00
Laurent Destailleur
4e145f0e5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-14 22:09:12 +01:00
Laurent Destailleur
7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php
 2018-02-14 22:08:18 +01:00
Laurent Destailleur
15ab37b46e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-14 21:51:55 +01:00
Laurent Destailleur
b21feca9d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-14 21:51:35 +01:00
Laurent Destailleur
147b35d62e
Merge pull request #8194 from hregis/6.0_multicompany 
Fix: Update entity field in llx_user_rights and llx_usergroup_rights
 2018-02-14 21:31:02 +01:00
Laurent Destailleur
cf5c972c65
Merge pull request #8193 from atm-ph/fix_6.0_multicurrency_situation_invoice 
Fix apply global progress don't update multicurrency values
 2018-02-14 21:27:52 +01:00
Laurent Destailleur
483bfb096b
Merge pull request #8188 from atm-quentin/6.0_develop 
NEW Add sale representative einstein_pdf_modules
 2018-02-14 21:27:24 +01:00
Laurent Destailleur
06357e62da
Merge pull request #8182 from laudeco/hotfix/bank_module 
Bank module is not accessible (error 500) since 7.0.0
 2018-02-14 20:52:36 +01:00
Laurent Destailleur
c28d87252b
Merge pull request #8184 from laudeco/hotfix/8183_welcome_email_adherent 
Fix 8183 - adherent welcome e-mail edition always put 1 instead of keeping the e-mail
 2018-02-14 20:51:57 +01:00
Laurent Destailleur
d0fdf700d7
Update type.php 2018-02-14 20:51:33 +01:00
Laurent Destailleur
0d00c51c2a
Update type.php 2018-02-14 20:51:05 +01:00
Laurent Destailleur
23ee6748f7
Update fournisseurs.php 2018-02-14 20:36:13 +01:00
Laurent Destailleur
8783857aa5 Fix tooltip of website editor 2018-02-14 20:33:48 +01:00
Laurent Destailleur
536eb7e008 Fix label of invoice 2018-02-14 17:25:13 +01:00
Laurent Destailleur
ca71d90d96 Fix help 2018-02-14 14:57:53 +01:00
Laurent Destailleur
9f883f3401 Fix install log disappeared 2018-02-14 14:50:22 +01:00
Regis Houssin
fa2fddcdc1 Fix: Update entity field in llx_user_rights and llx_usergroup_rights 2018-02-14 14:30:39 +01:00
Laurent Destailleur
7bdf335a8e Add a fix to clean data 2018-02-14 14:26:33 +01:00
atm-ph
c690dfb258 Fix apply global progress don't update multicurrency values 2018-02-14 10:15:38 +01:00
Laurent Destailleur
434980bb22 Fix svg image preview ko 2018-02-13 18:15:39 +01:00
Laurent Destailleur
e510e1b679 Fix search field at wrong column 2018-02-13 15:48:29 +01:00
Laurent Destailleur
7ed128ff2b Fix bad escaping 2018-02-13 14:30:14 +01:00
atm-quentin
144c13998a NEW_einstein_pdf_modules 2018-02-13 09:51:33 +01:00
Laurent Destailleur
88bdebb80f Fix label truncated 2018-02-12 23:08:01 +01:00
Laurent Destailleur
00a8be22a2 Fix field too small 2018-02-12 22:11:43 +01:00
De Coninck Laurent
1052213c97 Fix 8183 - adherent welcome e-mail 
Fix the adherent welcome e-mail.

[see: #8183]
 2018-02-12 18:12:43 +01:00
Laurent Destailleur
a4f48fcfb6 Fix feature must be hidden (not stable) 2018-02-12 16:09:22 +01:00
Laurent Destailleur
1c9f543fd5 Translation 2018-02-12 15:55:37 +01:00
Laurent Destailleur
b2835fc803 Fix check of vat only for european countries 2018-02-12 15:54:24 +01:00
De Coninck Laurent
6f7d6f977b fix error in latest release 2018-02-12 15:50:14 +01:00
Laurent Destailleur
30ba1c1702 FIX #8174 2018-02-12 14:02:51 +01:00
Laurent Destailleur
12e48e07ae Fix deletion of ledger line when editing transaction 2018-02-12 13:50:26 +01:00
Maxime Kohlhaas
ef05171641 Fix : contract service list context was mixing up with service list from product/service module 2018-02-12 13:48:43 +01:00
Laurent Destailleur
284e6f1ad3 Better position of error check 2018-02-12 13:39:06 +01:00
Laurent Destailleur
caa136bed3 FIX Debug journalization: Avoid journalizing if all lines not bound 2018-02-12 13:31:32 +01:00
Laurent Destailleur
09dfd5eb9f Fix journalization protection 2018-02-12 12:02:01 +01:00
Laurent Destailleur
734bd4d2fb Fix menu visible in dev only 2018-02-12 10:15:58 +01:00
Regis Houssin
24cc687724 Fix: you can't check "fournisseur" with checkUserAccessToObject without 
object ID
 2018-02-12 09:28:41 +01:00
Regis Houssin
448fcae02f Fix: move "fournisseur" in $checksoc 2018-02-12 09:03:53 +01:00
Regis Houssin
abb7e651d1 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug 2018-02-12 09:02:12 +01:00
Regis Houssin
40fe3849dc Fix: avoid Warning: A non-numeric value encountered 2018-02-12 08:21:35 +01:00
Laurent Destailleur
60a848de5a Fix bad list of id for supplier categories 2018-02-12 04:09:15 +01:00
Laurent Destailleur
64f61c80ad Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-12 04:08:13 +01:00
Laurent Destailleur
55779e3b55 Fix confusion between supplier and customer categories 2018-02-12 04:07:45 +01:00
Laurent Destailleur
9b8b3a1236
Merge pull request #8176 from hregis/7.0_bug2 
Fix: wrong param name (Travis error !)
 2018-02-12 03:25:23 +01:00
Laurent Destailleur
b23ef5fd8f
Merge pull request #8175 from hregis/7.0_bug 
Fix: check perms by type of product
 2018-02-12 03:25:08 +01:00
Laurent Destailleur
7f4adb7f97
Update card.php 2018-02-12 03:23:57 +01:00
Laurent Destailleur
975608b9d3 FIX #8174 2018-02-12 03:21:04 +01:00
Laurent Destailleur
4d6f87e544
Merge pull request #8168 from simnandez/6.0 
Fix: Contracts not show price
 2018-02-12 03:13:31 +01:00
Laurent Destailleur
d731857fd0
Update linkedobjectblock.tpl.php 2018-02-12 03:13:12 +01:00
Laurent Destailleur
671fbd3d55 Code comment 2018-02-12 02:59:18 +01:00
Laurent Destailleur
c03ceb2205 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-12 02:56:51 +01:00
Laurent Destailleur
12f1e4c04b
Merge pull request #8167 from atm-john/fix_contract_line_extrafields_on_save 
Fix Missing insert of extrafields on contract add line
 2018-02-12 02:56:19 +01:00
Laurent Destailleur
d3d3bcaca5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-12 02:53:21 +01:00
Laurent Destailleur
f88874c1f7 Code comment 2018-02-12 02:53:08 +01:00
Romain DESCHAMPS
8e42ed5824 add missing links in cust. card boxes 2018-02-12 02:40:13 +01:00
Romain DESCHAMPS
37ff46b05a add missing links in supplier card boxes 2018-02-12 02:40:09 +01:00
Laurent Destailleur
fa3b1c74a9 Fix bad link 2018-02-12 02:25:34 +01:00
Laurent Destailleur
b7b496132b Fix syntax error 2018-02-12 01:27:54 +01:00
Regis Houssin
3525306cc4 Fix: wrong var name 2018-02-11 13:29:37 +01:00
Regis Houssin
86df1ddd0a Fix: uniformize user rights check 2018-02-11 13:27:02 +01:00
Regis Houssin
2b7693c582 Fix: wrong param name (Travis error !) 2018-02-11 12:14:23 +01:00
Regis Houssin
01b3b8e09e Fix: check perms by type of product 2018-02-11 12:09:12 +01:00
Juanjo Menent
67ce71bc48 Fix: Contracts not show price 2018-02-09 18:23:11 +01:00
Laurent Destailleur
71c968b0b1 Fix lose validator user in edit 2018-02-09 16:06:48 +01:00
Laurent Destailleur
84fd67c407 CSS 2018-02-09 15:49:49 +01:00
John
2817ace0d2 Fix contract line extrafields save on add line 2018-02-09 15:47:18 +01:00
Regis Houssin
a5814ce779 Fix: nocheck for "fournisseur", already check with "societe" 2018-02-09 11:00:43 +01:00
Laurent Destailleur
d10d9f0fb2 Fix scrutinizer 2018-02-08 17:22:07 +01:00
atm-ph
b074f580db Fix can't update $nblignes on beforePDFCreation if we update $object->lines 2018-02-08 16:59:17 +01:00
Laurent Destailleur
b5c12b346c Fix typo 2018-02-08 16:50:43 +01:00
Laurent Destailleur
19a0f552c9 Fix td balance 2018-02-08 16:50:01 +01:00
Laurent Destailleur
a200a7f149 Fix look and feel v7 2018-02-08 16:43:10 +01:00
Laurent Destailleur
cc20a9d1d5 FIX #8079 2018-02-08 16:43:05 +01:00
Laurent Destailleur
2b2e68c78d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/societe/card.php
 2018-02-08 15:18:28 +01:00
Laurent Destailleur
39cd63e2d4
Merge pull request #8143 from simnandez/6.0 
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
 2018-02-08 14:07:14 +01:00
Laurent Destailleur
c8ba173563 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-08 13:27:56 +01:00
Laurent Destailleur
03b10041db Fix missing contextpage 2018-02-08 13:27:43 +01:00
Laurent Destailleur
071436caba
Merge pull request #8144 from hregis/7.0_bug 
Fix: wrong id name
 2018-02-08 13:19:54 +01:00
Laurent Destailleur
371b168db1
Merge pull request #8133 from atm-quentin/6.0 
FIX unset categorie
 2018-02-08 13:09:52 +01:00
Laurent Destailleur
3f17c92aa3
Update card.php 2018-02-08 13:09:21 +01:00
Laurent Destailleur
ab21769aa2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-08 12:58:47 +01:00
Laurent Destailleur
c988d3f1cc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2018-02-08 12:53:26 +01:00
Laurent Destailleur
2e3bb4a585 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-08 12:48:48 +01:00
Laurent Destailleur
8156374005 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-08 12:45:30 +01:00
Laurent Destailleur
a26bb2d884 FIX #8151 2018-02-08 12:41:31 +01:00
Laurent Destailleur
879308e0ef Fix responsive 2018-02-08 10:15:53 +01:00
Regis Houssin
70a65b89eb Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug 2018-02-08 08:52:45 +01:00
Laurent Destailleur
729cf20df7 Fix css 2018-02-07 20:53:13 +01:00
Laurent Destailleur
507328d83a Fix syntax error 2018-02-07 17:50:16 +01:00
Laurent Destailleur
37afc58c48 The module ExpenseReport use numbering rules that you can setup (like 
other modules do). If you need to keep the hard coded numbering rule of
expenses report used in 6.0, just add constant
EXPENSEREPORT_USE_OLD_NUMBERING_RULE to 1.
 2018-02-07 17:45:13 +01:00
Laurent Destailleur
cb5d0b1677 Fix compatibility option EXPENSEREPORT_USE_OLD_NUMBERING_RULE 2018-02-07 17:43:16 +01:00
Laurent Destailleur
510fc22172 Fix expense report 2018-02-07 17:01:14 +01:00
Laurent Destailleur
8dd7d69294 Fix commit 2018-02-07 16:04:31 +01:00
Laurent Destailleur
413331c7dd Fix travis 2018-02-07 15:54:58 +01:00
Laurent Destailleur
d8872a412b Fix numbering for expense report 2018-02-07 15:52:57 +01:00
atm-ph
6254e20c67 Fix position if module use pdf hook "linkedobjects" 2018-02-07 15:41:39 +01:00
Laurent Destailleur
852c4fc033 Fix context of filter not lost 2018-02-07 12:08:25 +01:00
Laurent Destailleur
b95cd2f383 Fix translation 2018-02-06 19:33:31 +01:00
Regis Houssin
8b7f40e15b Fix: wrong id name 2018-02-06 19:29:16 +01:00
Laurent Destailleur
5e7d172a58 Fix look and feel v7 on ref popup 2018-02-06 19:16:15 +01:00
Juanjo Menent
9b56555962 FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page 2018-02-06 18:49:29 +01:00
Laurent Destailleur
9962d36dbc Fix translation 2018-02-06 18:39:11 +01:00
Laurent Destailleur
490a1bd08d Fix label 2018-02-06 18:36:47 +01:00
Laurent Destailleur
69196dc52c Fix menu not visible with auguria module 2018-02-06 18:22:04 +01:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
565372eaab Fix param showsize. Fix extrafields field too long 2018-02-06 10:34:29 +01:00
Laurent Destailleur
930d58ab96 Fix import supplier product price vat 2018-02-06 10:03:06 +01:00
Laurent Destailleur
bf7ae08c48 sync transifex 2018-02-06 01:17:50 +01:00
Laurent Destailleur
b364b2a4de Fix selection of filter in agenda views 2018-02-06 01:16:51 +01:00
Laurent Destailleur
f251113f69 Fix accounting module with multicompany 2018-02-06 01:00:35 +01:00
Laurent Destailleur
074f4a3b46 Fix class not found when selecting project ref in lists 2018-02-06 00:34:14 +01:00
Laurent Destailleur
b063c19084 Fix: object project not defined 2018-02-06 00:19:40 +01:00
Laurent Destailleur
2fbe4637ac Fix bad filter link 2018-02-05 23:05:37 +01:00
Laurent Destailleur
6d52676600 Prepare 7.0 2018-02-05 20:50:15 +01:00
Laurent Destailleur
180f9918c7 Transifex sync 2018-02-05 20:43:50 +01:00
Laurent Destailleur
c2590b9c7e Fix: complete labels of operation if bank journal 
Conflicts:
	htdocs/compta/tva/class/tva.class.php
 2018-02-05 17:10:18 +01:00
Laurent Destailleur
ad384a9992 Fix default sort order 2018-02-05 17:08:47 +01:00
atm-quentin
2081aefc84 FIX creer into lire 2018-02-05 16:07:08 +01:00
Laurent Destailleur
aeeb787bae
Merge pull request #8135 from atm-arnaud/FIX_contact_order_by_name 
FIX order contactlist on Thirdparty by name
 2018-02-05 15:14:17 +01:00
arnaud
3c816acb05 FIX order contactlist on Thirdparty by name 2018-02-05 15:06:28 +01:00
Laurent Destailleur
72f6b2956a Fix: pagination into belugo template 2018-02-05 14:31:39 +01:00
Laurent Destailleur
775085e1b8 Border of comment box 2018-02-05 14:10:24 +01:00
Laurent Destailleur
85964e02de Fix css 2018-02-05 12:34:11 +01:00
Regis Houssin
839de65012 Fix: avoid error -1 2018-02-05 11:30:31 +01:00
atm-quentin
ae9c7ad6b6 FIX unset categorie 2018-02-05 10:40:52 +01:00
Laurent Destailleur
90bc859048 Fix trans 2018-02-05 02:34:49 +01:00
Laurent Destailleur
10e7517596 Fix missing mainmenu and leftmenu into menu definition 2018-02-05 02:29:19 +01:00
Laurent Destailleur
c02d46fb0a Fix leftmenu in menu entries 2018-02-05 01:33:44 +01:00
Laurent Destailleur
30c683ed65 Fix properties into tooltip 2018-02-05 00:36:54 +01:00
Laurent Destailleur
5455ab3280 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/projet/card.php
 2018-02-04 23:17:09 +01:00
Laurent Destailleur
906a9eaa5a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-04 23:12:57 +01:00
Laurent Destailleur
dbe45d03d3 Fix: amount into form must be numeric without format 2018-02-04 23:12:19 +01:00
Laurent Destailleur
354fc4edd0 Fix: amount into form must be numeric without format 2018-02-04 23:06:37 +01:00
Laurent Destailleur
fe57cf697f Fix init category selected 2018-02-04 14:35:38 +01:00
Laurent Destailleur
7ed66457b4 Fix ref already output 2018-02-04 13:55:18 +01:00
Laurent Destailleur
5a609215d5 Fix default value was not save at creation 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:23:04 +01:00
Laurent Destailleur
3cfb6aaa67 Fix missing trigger CONTRACT_MODIFY 2018-02-04 12:59:16 +01:00
Laurent Destailleur
956df63c87 Fix extrafields updated twice 2018-02-04 12:55:29 +01:00
Laurent Destailleur
e5cb2be618
Merge pull request #8129 from hregis/6.0_bug 
Fix: remove lines with special code when convert to reduc
 2018-02-04 12:18:20 +01:00
Laurent Destailleur
0e3d5ea9e5 Fix missing translation 2018-02-04 11:44:39 +01:00
Laurent Destailleur
f3700b66c6 Fix size of columns when using PRODUCT_USE_UNIT 2018-02-04 11:17:45 +01:00
Laurent Destailleur
fd8f89c708 FIX a discount is a percent, not an amount, so we use vatrate not price 2018-02-04 11:13:47 +01:00
Regis Houssin
8ee1186492 Fix: wrong test 2018-02-04 09:05:35 +01:00
Regis Houssin
d5b7184c8d Fix: wrong test 2018-02-04 09:04:15 +01:00
Regis Houssin
a161ca37ff Fix: use product_type instead special_code 2018-02-04 08:58:31 +01:00
Regis Houssin
c1e6d88442 Fix: use product_type instead special_code 2018-02-04 08:55:51 +01:00
Laurent Destailleur
c6fba7273d Api interventions 2018-02-03 20:58:26 +01:00
Laurent Destailleur
408fc69fac
Update index.php 2018-02-03 19:59:21 +01:00
Laurent Destailleur
48a31b2398
Update explorer.php 2018-02-03 19:58:30 +01:00
Laurent Destailleur
936a2ca966
Merge branch '7.0' into add-api-for-fichinter 2018-02-03 19:57:04 +01:00
Laurent Destailleur
30c68aecf2 Code comment 2018-02-03 19:52:09 +01:00
Laurent Destailleur
5ab5c12a7b Code comments 2018-02-03 19:42:00 +01:00
Laurent Destailleur
f57ea2682a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/notify.class.php
	htdocs/societe/class/societe.class.php
 2018-02-03 19:33:24 +01:00
Laurent Destailleur
6de2a08d70 Fix scrutinizer bugs 2018-02-03 19:10:52 +01:00
Laurent Destailleur
a91172b7bc Add comment into csv export 2018-02-03 18:58:02 +01:00
Laurent Destailleur
2114e6ba4e
Merge pull request #8101 from simnandez/6.0 
FIX: #7974 Contract - Invalid reference on the document
 2018-02-03 16:57:22 +01:00
Laurent Destailleur
fa3f06aaaa
Merge pull request #8123 from atm-florian/7.0 
fix warning class declaration
 2018-02-03 16:33:39 +01:00
Laurent Destailleur
756f8a1b9f
Update modules_expensereport.php 2018-02-03 16:33:27 +01:00
Laurent Destailleur
97a29e87ea Fix pdf template baleine (pb with page breaks and long task desc) 2018-02-03 16:31:36 +01:00
Juanjo Menent
c434136ba5 Merge remote-tracking branch 'upstream/6.0' into 6.0 2018-02-02 23:44:54 +01:00
Juanjo Menent
464ee6f9d6 Revert 2018-02-02 17:46:25 +01:00
Laurent Destailleur
fe1f276d85 FIX labels into ledger are same that into screen 
FIX pagination
FIX init of fiscal year
Fix tr balance
 2018-02-02 17:24:40 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible. 
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
 2018-02-02 14:27:07 +01:00
Regis Houssin
13106d34a6 Fix: compatibility with multicompany sharing 2018-02-02 12:36:47 +01:00
Laurent Destailleur
d3a6342034 Fix regeneration of PDF after creation of payment. 2018-02-02 10:37:10 +01:00
Regis Houssin
38d735341c Fix: remove lines with special code when convert to reduc 2018-02-02 10:24:16 +01:00
Regis Houssin
2147bd23e6 Fix: remove lines with special code when convert to reduc 2018-02-02 10:22:47 +01:00
Laurent Destailleur
742079cfe3 Clean code 2018-02-01 19:15:50 +01:00
Laurent Destailleur
0412d3d11d Fix extrafield mandatory check.Fix empty extrafields with type link. 2018-02-01 19:05:24 +01:00
Laurent Destailleur
f6c17247af Fix can set draft status of project 2018-02-01 17:50:19 +01:00
florian HENRY
5d20af7751 fix warning class declaration 2018-02-01 16:15:57 +01:00
Laurent Destailleur
b2536d8ebb FIX #8110 2018-02-01 15:44:35 +01:00
Laurent Destailleur
6e446ccaae Fix scrutinizer 2018-02-01 10:51:01 +01:00
Laurent Destailleur
ed3bcf59b6 Try doc hint array of array of int with @var int[][] 2018-02-01 10:50:50 +01:00
atm-quentin
c80fa48225 FIX update_extras on fourn card 2018-02-01 09:31:04 +01:00
Laurent Destailleur
f6f57aa938 Missing Api for standing proposal/orders/invoices 2018-02-01 02:29:41 +01:00
Laurent Destailleur
74a34acf77 Tab vs space 2018-02-01 02:14:17 +01:00
Laurent Destailleur
9c6b6f244c Fix tooltip on invoice 2018-02-01 01:25:45 +01:00
Laurent Destailleur
8896e0573f Fix missing name alias 2018-02-01 01:10:54 +01:00
Laurent Destailleur
0385dfe859 Fix td balance 2018-02-01 00:49:12 +01:00
Laurent Destailleur
b49a7e245c Add hidden option INVOICE_NO_PAYMENT_DETAILS required by some countries 2018-01-31 20:22:19 +01:00
Laurent Destailleur
14ecdce650 Fix merge of thirdparties (pb when merging codes and error management) 2018-01-31 18:01:56 +01:00
Laurent Destailleur
de0a8ba71f Fix extrafields 2018-01-31 14:01:58 +01:00
Laurent Destailleur
e9f8c7ba01 Fix edit of extrafields "link" corrupts the data definition 2018-01-31 10:51:40 +01:00
Laurent Destailleur
89dc208072 Fix fk_account not into update 2018-01-30 17:00:17 +01:00
Laurent Destailleur
d6317a26d2 Fix for multicompany 2018-01-30 15:48:09 +01:00
Laurent Destailleur
0d90ab0c6c Fix when counter is corrupted in database 2018-01-30 14:42:13 +01:00
Laurent Destailleur
d744a1af0d Fix look and feel v7 2018-01-30 11:30:03 +01:00
Laurent Destailleur
be874f0b1d Fix fulltag 2018-01-30 11:24:02 +01:00
Laurent Destailleur
06f2382e39 Fix compatibility with old actioncomm record 2018-01-30 11:05:11 +01:00
Laurent Destailleur
cd91a81456 CSS 2018-01-30 10:47:06 +01:00
Laurent Destailleur
acf92da12d Fix option MEMBER_NEWFORM_AMOUNT 2018-01-30 10:43:24 +01:00
Laurent Destailleur
cc0048474e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-01-29 21:28:31 +01:00
Laurent Destailleur
e208e5b8a7 Fix look and feel v7 2018-01-29 21:27:46 +01:00
Laurent Destailleur
bdfbe462df Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-29 21:04:49 +01:00
Laurent Destailleur
7bb46e65d7
Merge pull request #8103 from simnandez/7.0 
Trad: more understandable extrafield translation to the end user
 2018-01-29 20:45:42 +01:00
Laurent Destailleur
8102883356 Fix error when email list contains ', ,' 
Fix output dir of notification
 2018-01-29 20:36:40 +01:00
Laurent Destailleur
8cd54d6630
Merge pull request #8108 from laudeco/hotfix/invoice_book 
fix issue on Big book
 2018-01-29 19:47:09 +01:00
Laurent Destailleur
1f30f9b179
Update list.php 2018-01-29 19:46:46 +01:00
Laurent Destailleur
491e64db06 Fix various payments 2018-01-29 19:07:42 +01:00
Laurent Destailleur
4eb7d7a332 Debug blockedlog with various payments 2018-01-29 18:22:26 +01:00
Juanjo Menent
3c281ccefa FIX: Bad localtaxes assignment in cashdesk 2018-01-29 17:50:00 +01:00
Laurent Destailleur
8ae25b3c65 Fix the FACTURE_ENABLE_NEGATIVE was useless without 
FACTURE_ENABLE_NEGATIVE_LINES
 2018-01-29 16:21:54 +01:00
Laurent Destailleur
c67e57836e Code comment 2018-01-29 12:58:33 +01:00
Laurent Destailleur
0a11d52d53 Fix info on email sent 2018-01-29 12:46:07 +01:00
Laurent Destailleur
424e8a3139 Fix price format in payment pages 2018-01-29 12:10:06 +01:00
Laurent Destailleur
3c4ed55179 Fix css 2018-01-29 11:32:56 +01:00
Laurent Destailleur
716d44a610 Fix price in member public form 2018-01-29 11:22:02 +01:00
Laurent Destailleur
c41374220e Fix css 2018-01-29 11:13:18 +01:00
De Coninck Laurent
857c03eeb9 fix issue on Big book 2018-01-28 21:04:13 +01:00
Laurent Destailleur
a87ecc14ec Fix install.lock not always saved 2018-01-28 10:58:15 +01:00
Laurent Destailleur
65c7117240 Fix var serialized twice 2018-01-27 19:40:42 +01:00
Laurent Destailleur
7dcb3bf6fc Fix var not initialized 2018-01-27 19:40:35 +01:00
Laurent Destailleur
a639308601 Fix css 2018-01-27 19:40:16 +01:00
Laurent Destailleur
bee64962fe Fix css 2018-01-27 19:40:11 +01:00
kadogo
ba58578d60 FIX: Global on $user parameter reset the variable 
When we use the fichinter API with global, the $user object is reset
If global is not applied on $user we can retrieve the informations from it
 2018-01-27 19:31:48 +01:00
kadogo
b48bcc9ab8 NEW: Add an API for fichinter 
We missed an API for fichinter
It add list, create and create line functions
 2018-01-27 19:25:18 +01:00
Juanjo Menent
13adf06ae4 Trad: more understandable extrafield translation to the end user 
Trad: fix english words
Trad: more accurate accounting translation
 2018-01-27 15:48:11 +01:00
Juanjo Menent
cdb63bada3 FIX: #7974 Contract - Invalid reference on the document 2018-01-26 18:13:55 +01:00
Laurent Destailleur
ba0a96c882 Missing param limit 2018-01-26 15:37:23 +01:00
Laurent Destailleur
c5307e5cac Fix option MAILING_LIMIT_SENDBYWEB 2018-01-26 15:12:40 +01:00
Laurent Destailleur
d4e15545b4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-01-26 12:10:13 +01:00
Laurent Destailleur
1834be79a0 Fix supplier suggested when creating order from project overview 2018-01-26 11:31:34 +01:00
Laurent Destailleur
5b917c039e Prepare 6.0.6 2018-01-26 11:08:08 +01:00
Laurent Destailleur
82c2079d40 Fix var not initialized 2018-01-26 10:23:24 +01:00
Laurent Destailleur
d751f9153f Fix look and feel v7 2018-01-26 10:21:53 +01:00
Laurent Destailleur
1be42a7af8 Fix comment 2018-01-26 02:23:26 +01:00
Laurent Destailleur
4f9f1b51d7 Fix translation 2018-01-26 01:34:49 +01:00
Laurent Destailleur
e79f6fda2b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-26 01:23:18 +01:00
Laurent Destailleur
2c0eeaf8de FIX #8093 2018-01-25 20:57:51 +01:00
Laurent Destailleur
c922498e79 Code comment 2018-01-25 20:35:25 +01:00
Laurent Destailleur
cff1dc6827 Rename 2018-01-25 17:57:49 +01:00
Laurent Destailleur
e9441f7881 Fix name of log module to avoid confusion with blocked log 2018-01-25 17:56:46 +01:00
Laurent Destailleur
59c907260b Export of unalterablelog must contains init hash 2018-01-25 13:18:52 +01:00
Laurent Destailleur
8d7f6843a4 Must be able to export lockedlog for a dedicated year. 
Fix date are nto humanly readable.
 2018-01-25 12:57:36 +01:00
Laurent Destailleur
005bccc63d Fix missing badge of nb of permissions 2018-01-25 12:06:22 +01:00
Laurent Destailleur
f66ac935c8 Fix migration for files from modules 2018-01-24 20:00:27 +01:00
Laurent Destailleur
18ed53b9a7 Fix css 2018-01-24 18:04:06 +01:00
Laurent Destailleur
60c1a1e745 Code comment on accesskey 2018-01-24 17:29:29 +01:00
Laurent Destailleur
d796f403a9 Fix sender email when sending a password remind 2018-01-24 15:43:55 +01:00
Laurent Destailleur
f3b89d9d39 Add missing trans 2018-01-24 14:47:52 +01:00
Laurent Destailleur
9cdb7f0f27 Code comment 2018-01-24 14:37:26 +01:00
Laurent Destailleur
e45d35dcb1 Fix code comment 2018-01-24 14:22:11 +01:00
Laurent Destailleur
fbeb66fedd Fix refreshing of captcha broken if a cache-control set by server 2018-01-24 13:40:39 +01:00
Laurent Destailleur
6e906ac0e3 Clean code 2018-01-24 13:08:09 +01:00
Laurent Destailleur
64f6e9e5c0 CSS 2018-01-24 12:23:52 +01:00
Laurent Destailleur
3a4ca8ae2b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-24 11:49:36 +01:00
Laurent Destailleur
1da7b154c1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-24 11:48:31 +01:00
Laurent Destailleur
54fb59d8db Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/paiement.php
 2018-01-24 11:45:43 +01:00
Laurent Destailleur
af2efaf137 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-24 11:44:01 +01:00
Laurent Destailleur
561f273900 Minor fix for smartphone 2018-01-24 11:43:34 +01:00
Laurent Destailleur
e66b266432
Merge pull request #8090 from atm-arnaud/FIX_sepa_mail_encode 
FIX email sent was not in HTML
 2018-01-24 11:17:16 +01:00
Laurent Destailleur
ccb415c8b3
Merge pull request #8087 from frederic34/patch-2 
Update bills.lang
 2018-01-24 11:15:25 +01:00
Laurent Destailleur
fd48ce11f9
Merge pull request #8085 from Darkjeff/Fixing-Lettering 
Fixing lettering
 2018-01-24 11:14:19 +01:00
De Coninck Laurent
53ac13c792 check on type replacement #8028 2018-01-23 18:03:29 +01:00
arnaud
c0481be8d8 FIX subject mail sepa 2018-01-23 17:01:03 +01:00
arnaud
19c616756a FIX email sent was not in HTML 2018-01-23 12:14:22 +01:00
John
f2ae3ee41d Fix get entity if multiple 2018-01-23 09:49:21 +01:00
Laurent Destailleur
f1b63d7cbf Fix css 2018-01-23 09:00:03 +01:00
Laurent Destailleur
c969d58907 Clean code 2018-01-22 23:51:24 +01:00
Laurent Destailleur
39c4df723a Fix error management when setting product accounts 2018-01-22 21:07:10 +01:00
Frédéric FRANCE
7ac286463f
Update bills.lang 2018-01-22 17:23:59 +01:00
Laurent Destailleur
d1365c2492 Fix trackid 2018-01-22 17:15:44 +01:00
atm-ph
054d98a2ba Fix each total isn't aligned on payment card 2018-01-22 17:09:17 +01:00
Laurent Destailleur
2ed34d813d Css 2018-01-22 16:04:58 +01:00
Darkjeff
f47f0357d3 Fixing Subledger account in lettering 2018-01-22 15:57:17 +01:00
Laurent Destailleur
7a1a2cf90d Fix send into ledger for bank line record. Show accounted status. 2018-01-22 04:13:29 +01:00
Laurent Destailleur
273e88a599 Fix send into ledger for expense report. Show accounted status. 2018-01-22 03:07:11 +01:00
Laurent Destailleur
3c3e02dbea Fix missing fields 2018-01-21 22:47:15 +01:00
Laurent Destailleur
710cefa3a8 Add missing vat rates 2018-01-21 21:30:11 +01:00
Laurent Destailleur
3987033aab Fix substitution in public notes of pdf 2018-01-21 20:53:36 +01:00
Laurent Destailleur
dfc7d47747 Fix message 2018-01-21 15:32:10 +01:00
Laurent Destailleur
e6bfc3354a FIX #8071 2018-01-20 18:42:12 +01:00
Laurent Destailleur
0fb3669529 Fix for #8071 2018-01-20 18:33:25 +01:00
Laurent Destailleur
a3a24e2182 Clean chart of account files 2018-01-20 17:52:01 +01:00
Laurent Destailleur
fd6f0a4494 Fix use constant for status 2018-01-20 13:03:18 +01:00
Laurent Destailleur
fa30804364
Merge pull request #8075 from Conspir3D/develop 
Added order status =1 or =2 for overview of orders
 2018-01-20 13:00:53 +01:00
Laurent Destailleur
80b2b7d8f2
Merge pull request #8074 from all3kcis/develop-patch-15 
Fix #8058
 2018-01-20 12:55:40 +01:00
Laurent Destailleur
23494a9dd4
Update product.php 2018-01-20 12:53:30 +01:00
Laurent Destailleur
abdf587fb5 Fix link to expert accounting no visible if module off 2018-01-20 12:12:36 +01:00
Laurent Destailleur
3a8ceb130f Fix utf8 on all fields 2018-01-19 15:17:19 +01:00
Laurent Destailleur
9d0a0ed867 Fix demo 2018-01-19 12:55:03 +01:00
Laurent Destailleur
0296661864 Complete the demo profile 2018-01-19 12:39:47 +01:00
Jan Giebels
9642206bd1 Fix label generation for fichinter card generation from order. Labels get concatenated. 2018-01-19 12:21:42 +01:00
Laurent Destailleur
a892a3fe71 Fix info of collation is wrong on log 2018-01-19 12:10:03 +01:00
Laurent Destailleur
937a27396f Fix log of install disappear. 2018-01-19 11:43:55 +01:00
Jan Giebels
d01a8d0508 Added order status =1 or =2 for overview 2018-01-19 11:22:25 +01:00
All-3kcis
a58a3f893d Fix #8058 2018-01-19 10:21:48 +01:00
De Coninck Laurent
4874d08062 fix the bill replacement with discounts #8028 2018-01-19 09:01:37 +01:00
Laurent Destailleur
d967527b58 Fix status was not refreshed 2018-01-18 18:40:01 +01:00
Laurent Destailleur
768c93a707 Fix suggested amount for direct debit order 2018-01-18 18:22:10 +01:00
Laurent Destailleur
1730feeb4f Fix error message 2018-01-18 17:52:48 +01:00
Maxime Kohlhaas
4c0dc21ca0 Fix validate contrat was not using force_number parameter 2018-01-18 14:07:32 +01:00
Laurent Destailleur
3871c694f6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-17 19:50:33 +01:00
Laurent Destailleur
57f664c0c1 Fix vat npr for template invoices 2018-01-17 19:45:23 +01:00
Laurent Destailleur
4034122169 Fix usage of PAYMENT_SECURITY_TOKEN 2018-01-17 18:00:05 +01:00
Laurent Destailleur
81999be027 Fix lose filter type 2018-01-17 17:29:17 +01:00
Laurent Destailleur
756838c3a0 Fix lose filter type 2018-01-17 17:13:50 +01:00
Laurent Destailleur
56d702e3c6 Fix missing property in tooltip 2018-01-17 16:26:24 +01:00
Laurent Destailleur
bc7bd77cea Fix permission to open supplier order 2018-01-17 15:54:27 +01:00
Laurent Destailleur
1e9ddf153c Fix workboard not visible on smartphone, so i invert position with stats 2018-01-17 13:55:53 +01:00
Laurent Destailleur
dcd579242f Fix <br /> (xml) into <br> (html) 2018-01-17 13:26:57 +01:00
Laurent Destailleur
2e0ec5e76a Fix <br> 2018-01-17 13:17:33 +01:00
Laurent Destailleur
be821716f0 code comment 2018-01-17 12:26:20 +01:00
Laurent Destailleur
0a85a4702a Fix https 2018-01-17 11:41:03 +01:00
Laurent Destailleur
ef5939fe78 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-17 11:20:32 +01:00
Laurent Destailleur
1a04178d64 Clean unused file and fix missing translation 2018-01-17 11:20:18 +01:00
Laurent Destailleur
3f551f0d05 Fix migration 2018-01-17 02:19:32 +01:00
Laurent Destailleur
a84ed841cc Fix creation date was not filled 2018-01-16 20:47:33 +01:00
Laurent Destailleur
26ba0a9ec2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cashdesk/index.php
	htdocs/compta/index.php
	htdocs/core/lib/security.lib.php
	htdocs/societe/list.php
 2018-01-16 20:23:32 +01:00
Laurent Destailleur
5d4eda68e0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-16 19:53:02 +01:00
Laurent Destailleur
94b1d59f2b Fix missing check on object entity 2018-01-16 19:52:14 +01:00
Laurent Destailleur
59eefa46e6 Fix duplicate search field 2018-01-16 18:02:36 +01:00
Laurent Destailleur
1c3fb7f94b Fix responsive of boxes 2018-01-16 16:15:49 +01:00
Laurent Destailleur
f307fecaf6
Merge pull request #8064 from atm-quentin/6.0 
FIX missing hook invoice index
 2018-01-16 12:15:06 +01:00
Laurent Destailleur
51421a8bf6 Fix position of fields 2018-01-15 18:11:56 +01:00
Laurent Destailleur
25d59cf107 Fix sort on common fields 2018-01-15 18:05:15 +01:00
Laurent Destailleur
3d34a839a3 Doc 2018-01-15 17:43:18 +01:00
Laurent Destailleur
926683763b Modulebuilde fix sort of fields, fix generation of files 2018-01-15 17:38:15 +01:00
atm-quentin
6feacab4f5 FIX missing hook invoice index 2018-01-15 14:24:19 +01:00
Laurent Destailleur
bc2009874d Fix code comment 2018-01-15 12:59:30 +01:00
Laurent Destailleur
4c8af0ff50 Fix name alias on list 2018-01-15 12:24:56 +01:00
Laurent Destailleur
b154357683
Merge pull request #7982 from simnandez/6.0 
FIX: Bad name alias showing in name of third column
 2018-01-15 12:22:40 +01:00
Laurent Destailleur
3b9aee7d4c
Update list.php 2018-01-15 12:22:21 +01:00
Laurent Destailleur
e4c02152b3 Fix navigation in bookeeping view grouped by account 2018-01-15 12:14:18 +01:00
Laurent Destailleur
04a5dc79e9
Merge pull request #8054 from artis-auxilium/accounting_searchdate_fiscalyear 
Accounting searchdate fiscalyear
 2018-01-15 11:38:04 +01:00
Laurent Destailleur
926f39fc2b
Merge pull request #8060 from atm-maxime/fix_blockaedlog_migration 
Fix blockedlog triggers fatal error in migration script
 2018-01-15 11:34:48 +01:00
Laurent Destailleur
c29bfcef31
Merge pull request #8053 from Oeris/develop-api 
FIX use DB PREFIX instead of llx_
 2018-01-15 11:33:09 +01:00
Laurent Destailleur
193dfec29e
Merge pull request #8061 from fappels/7.0_fix_module_builder 
7.0 fix module builder
 2018-01-15 11:32:40 +01:00
Laurent Destailleur
64fd5154c9
Merge pull request #8052 from hregis/develop_multicompany 
Fix: regression and broken feature
 2018-01-15 11:31:07 +01:00
Laurent Destailleur
68f0808d16
Update societe.class.php 2018-01-15 11:30:32 +01:00
Laurent Destailleur
b8688a46d3
Update contact.class.php 2018-01-15 11:30:11 +01:00
fappels
00185bd9d4 Fix fetchCommon should return 0 iso error if not found 2018-01-15 11:21:24 +01:00
Laurent Destailleur
3410e29755 CSS 2018-01-15 11:20:45 +01:00
Laurent Destailleur
90fc086814 Fix minor 2018-01-14 20:11:38 +01:00
Laurent Destailleur
cc5dcde9e1 Fix protection to avoid errors 2018-01-14 18:55:55 +01:00
Laurent Destailleur
3c3402bc60 Debug API for prices of products 2018-01-14 15:58:04 +01:00
fappels
d6ed968c51 html modulebuilder type is a text type in database 2018-01-14 15:41:37 +01:00
fappels
25b455272a Fix 0 is a valif value for a NOT NULL field 2018-01-14 15:31:31 +01:00
Laurent Destailleur
133e87fcc3 Sync transifex 2018-01-14 12:45:26 +01:00
Maxime Kohlhaas
36afa87fb5 Fix blockedlog triggers fatal error in migration script 2018-01-14 11:56:45 +01:00
Laurent Destailleur
f0d6099e5f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/core/lib/functions.lib.php
 2018-01-14 03:15:49 +01:00
Laurent Destailleur
9f6118ed52 Code comments 2018-01-14 03:12:22 +01:00
Laurent Destailleur
debc758134 Fix code comment 2018-01-14 01:40:12 +01:00
Laurent Destailleur
7a087327e1 Fix deprecated code 2018-01-13 19:33:40 +01:00
Laurent Destailleur
c947502efa Fix typo 2018-01-13 17:22:59 +01:00
Laurent Destailleur
1f2d275ef2 Fix conditions of some fields 2018-01-13 17:21:56 +01:00
Laurent Destailleur
7c480f76e3 Fix thumbs of pdf at wrong place 
Fix param not provided
Fix css
 2018-01-13 16:09:05 +01:00
Laurent Destailleur
aa1692483f Fix colspan 2018-01-13 16:06:04 +01:00
Laurent Destailleur
8d793c680e Fix dol_delete_preview 2018-01-13 15:48:30 +01:00
Laurent Destailleur
7a88afe962 Fix field enabled and perms must differs 2018-01-13 13:16:33 +01:00
Laurent Destailleur
3bcf1d9da6 Fix css 2018-01-13 12:08:24 +01:00
Laurent Destailleur
53b36435d0 Fix on smartphone 2018-01-12 20:50:18 +01:00
Laurent Destailleur
854a71726c Fix lose filters 2018-01-12 20:32:30 +01:00
Laurent Destailleur
5fb8672221 Fix blockedlog. Browser can be used with large amount of events 2018-01-12 20:24:09 +01:00
Laurent Destailleur
8014f7d822 Fix blockedlog module must store ref of invoice once validated 2018-01-12 19:09:43 +01:00
Laurent Destailleur
d0680b429f Fix name of file saved from tax document tab 2018-01-12 17:39:20 +01:00
Laurent Destailleur
7bfcfd4574 Fix recursive path when dir is '0' 2018-01-12 17:12:38 +01:00
Laurent Destailleur
32a998e68d Fix preview link 2018-01-12 16:28:10 +01:00
Laurent Destailleur
8b972313ae Fix scrutinizer 2018-01-12 15:38:53 +01:00
Laurent Destailleur
ad4b59d2c8 Fix scrutinizer 2018-01-12 15:33:21 +01:00
Laurent Destailleur
92f8fc8b85 Fix scrutinizer 2018-01-12 15:26:50 +01:00
Laurent Destailleur
ac8a7f064a More robust code 2018-01-12 15:23:56 +01:00
Laurent Destailleur
64ae70d106 Fix scrutinizer bug 2018-01-12 15:20:17 +01:00
Laurent Destailleur
7da9911db1 Fix message 2018-01-12 15:06:50 +01:00
Laurent Destailleur
28207ad4cb Clean var 2018-01-12 14:57:02 +01:00