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

47757 Commits

Author SHA1 Message Date
aspangaro
21e753d510 Uniformize presentation on intervention 2016-08-03 08:00:30 +02:00
aspangaro
da274f0ca4 Uniformize presentation on contract 2016-08-03 07:28:00 +02:00
Laurent Destailleur
abbe204c97 Fix design of option PROJECT_ADD_SUBTOTAL_LINES 2016-08-03 01:42:05 +02:00
Laurent Destailleur
6ae8d26a89 Fix max width on combo of tasks 2016-08-03 00:04:38 +02:00
Laurent Destailleur
216ec6ac4b Label week too long with some language 2016-08-02 23:33:31 +02:00
Laurent Destailleur
88dcb27981 Fix option not visible when it should 2016-08-02 21:24:14 +02:00
Laurent Destailleur
176b52f305 Fix No modify trigger must be called during creation 2016-08-02 17:55:13 +02:00
Laurent Destailleur
3ea7a1fcab Fix strict mode 2016-08-02 17:36:24 +02:00
Laurent Destailleur
75b909ce93 Fix missing transaction in update_perso function 2016-08-02 16:55:32 +02:00
florian HENRY
5144f21c6c FIX php Strict 2016-08-02 15:36:00 +02:00
Laurent Destailleur
cc21909909 Fix dol_include_once could not work to get external url of a module 2016-08-02 14:33:46 +02:00
Laurent Destailleur
86f576f8d3 Fix strict sql 2016-08-02 13:45:35 +02:00
Laurent Destailleur
54df49aebe Fix strict sql 2016-08-02 13:36:16 +02:00
Laurent Destailleur
fdfe333f69 Fix strict sql 2016-08-02 13:10:09 +02:00
aspangaro
f232ae9160 Fix Expense report | VAT disable in Dolibarr, traduction of code_libelle & presentation 2016-08-02 07:47:15 +02:00
aspangaro
dd2e43754e Uniformize presentation in Thirdparty 2016-08-02 06:02:01 +02:00
Laurent Destailleur
e335ce6f45 Fix bad var declared 2016-08-01 19:54:03 +02:00
Laurent Destailleur
dfc38351ef Fix $i not initialized 2016-08-01 19:48:39 +02:00
Laurent Destailleur
a35dd9f2d1 Fix bad separation of address 2016-08-01 19:37:17 +02:00
Laurent Destailleur
5eda10e0dd Fix link 2016-08-01 16:04:49 +02:00
Laurent Destailleur
a02c539a82 FIX #5521 2016-08-01 15:53:51 +02:00
Laurent Destailleur
7dec327995 FIX #5568 2016-08-01 15:43:40 +02:00
Laurent Destailleur
bb99209b5e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-01 15:06:22 +02:00
Laurent Destailleur
621a7d93fa Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-01 15:05:57 +02:00
Laurent Destailleur
97dd1f4bbb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2016-08-01 15:03:59 +02:00
Laurent Destailleur
803fe68061 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2016-08-01 15:01:14 +02:00
BENKE Charlie
9a0494bd64 Update bonprelevement.class.php 2016-08-01 14:11:58 +02:00
Laurent Destailleur
417dd6465c Merge pull request #5570 from aspangaro/4.0-p36 
Fix Presentation & uniformize code
 2016-08-01 13:39:54 +02:00
Laurent Destailleur
e0c232548e Fix theme crazy after migration 2016-08-01 10:55:41 +02:00
Ferran Marcet
fb2444c7a3 Fix: Can't set PRODUIT_LIMIT_SIZE to value 0 2016-08-01 10:20:10 +02:00
aspangaro
8ce5fcd980 Uniformize presentation salary payment 2016-08-01 07:40:05 +02:00
aspangaro
0b7a5a4af9 Uniformize presentation donation 2016-08-01 07:34:55 +02:00
aspangaro
4a0eb496fa Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36 
Conflicts:
	htdocs/societe/rib.php
 2016-08-01 07:27:49 +02:00
aspangaro
4ee4de4a00 Uniformize presentation supplier invoice 2016-08-01 07:21:24 +02:00
aspangaro
3cdb2d45c2 Uniformize presentation customer invoice 2016-08-01 07:10:42 +02:00
aspangaro
26f98a2ab7 Presentation 2016-08-01 06:45:29 +02:00
aspangaro
30ec33f152 Missing key language 2016-08-01 06:45:00 +02:00
aspangaro
63220eae18 Presentation 2016-08-01 04:40:56 +02:00
Laurent Destailleur
1e037a9b95 Fix pb of responsive design 2016-07-31 18:28:59 +02:00
Laurent Destailleur
20a2282efc Updated screenshots 2016-07-31 16:24:32 +02:00
Laurent Destailleur
5f0951dcda Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:20:40 +02:00
Laurent Destailleur
51e941b9b4 Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:07:55 +02:00
Laurent Destailleur
33495847b7 Merge branch '4.0-p36' of https://github.com/aspangaro/dolibarr into 
aspangaro-4.0-p36

Conflicts:
	htdocs/societe/rib.php
 2016-07-31 03:05:34 +02:00
Laurent Destailleur
0414f09e48 Fix permissions 2016-07-30 21:09:30 +02:00
Laurent Destailleur
44b02f1d6c Hide module cron 2016-07-30 20:59:06 +02:00
Laurent Destailleur
b165a31c0d Fix old module to disable 2016-07-30 20:55:20 +02:00
Laurent Destailleur
8ada144f6e Fix demo 2016-07-30 20:53:00 +02:00
Laurent Destailleur
04e814d1a6 Update demo 2016-07-30 20:51:22 +02:00
Laurent Destailleur
a87c2f9579 Fix several fixes on margin reports 2016-07-30 18:57:26 +02:00
Laurent Destailleur
246321cd8f Fix clean orphelins of leave request logs in repair tools 
Fix date of supplier proposal missing.
 2016-07-30 18:08:07 +02:00
Laurent Destailleur
e5583f1544 Fix bad translation. Confusionbetween internal tranfert and bank 
tranfert for payements
 2016-07-30 17:28:18 +02:00
Laurent Destailleur
857de64607 Fix multicurrency 2016-07-30 16:41:10 +02:00
Laurent Destailleur
7678940e50 Fix refresh cache value of nb of files into a dir into ECM module 2016-07-30 15:51:27 +02:00
Laurent Destailleur
a6147ee73b Miscellaneous fixes 2016-07-30 14:49:29 +02:00
Laurent Destailleur
e3f0ab9109 Fix tag was not visible 2016-07-30 14:05:39 +02:00
Laurent Destailleur
ceb6199e87 Fix default numbering module of customer code was not enabled. 2016-07-30 12:31:32 +02:00
Laurent Destailleur
b3dab8a6f7 Better translation 2016-07-30 11:56:22 +02:00
Laurent Destailleur
7a72b9bb09 Use https links 2016-07-30 11:40:55 +02:00
Laurent Destailleur
5b4c215526 Fix size of field too small and bad translation 2016-07-30 10:31:56 +02:00
aspangaro
3c3df0c4f6 Fix Presentation 2016-07-29 23:52:49 +02:00
Laurent Destailleur
ff9d6ce02a Fix missing translation 2016-07-29 23:02:40 +02:00
Laurent Destailleur
45d354ad82 Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN... 2016-07-29 22:58:39 +02:00
Laurent Destailleur
eafaa6f4dd Fix doxygen 2016-07-29 17:30:33 +02:00
Laurent Destailleur
69247afd06 FIX #4447 2016-07-29 17:26:24 +02:00
Laurent Destailleur
a7b21db210 Fix code is not mandatory on vat table 2016-07-29 17:22:02 +02:00
Laurent Destailleur
9a4240c292 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-07-29 17:20:30 +02:00
Laurent Destailleur
45e38efdfa FIX #5473 2016-07-29 17:20:14 +02:00
Laurent Destailleur
0c456add13 A more complete example of odt template 2016-07-29 16:33:31 +02:00
Laurent Destailleur
9fabfe029b Remove debug logs 2016-07-29 16:31:29 +02:00
Laurent Destailleur
45e37c82cd FIX #5539 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2016-07-29 16:29:31 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Laurent Destailleur
b3cdb1f163 FIX tag for date rfc in odt substitution 2016-07-29 16:21:28 +02:00
Laurent Destailleur
27243069cb FIX #5535 bad dependency. 
Conflicts:
	htdocs/fourn/facture/list.php
 2016-07-29 15:19:04 +02:00
Marcos García de La Fuente
86c2ced714 Missing $user variable 2016-07-29 11:53:24 +02:00
Laurent Destailleur
537a51b367 Finally, better without the test 2016-07-29 11:19:16 +02:00
Juanjo Menent
4cadf0e5a3 Merge pull request #5563 from fmarcet/3.9 
FIX: Can't create withdrawal document
 2016-07-29 08:35:26 +02:00
Juanjo Menent
a40ea9387b Merge pull request #5562 from atm-florian/3.9 
FIX: incoterms do not output into crabe invoice PDF
 2016-07-29 08:34:01 +02:00
aspangaro
20144c9883 FIX Accountancy - Problem with the manage of the zero at the end of an accounting account in dolibarr for somes countries. Add an option. 2016-07-29 07:32:55 +02:00
Laurent Destailleur
5d97ce038b Fix page break when using a large html footer. 2016-07-28 23:58:13 +02:00
Laurent Destailleur
74a9bbbf38 FIX private property can't be read when building pdf 2016-07-28 23:51:09 +02:00
Laurent Destailleur
80ac99e9b1 Fix missing field into response 2016-07-28 23:50:17 +02:00
Laurent Destailleur
25a3f8a8fd Fix condition does not match workflow described into page 
https://wiki.dolibarr.org/index.php/Module_Expense_Reports
 2016-07-28 20:00:56 +02:00
Ferran Marcet
5bc51a3439 FIX: Can't create withdrawal document 2016-07-28 16:56:23 +02:00
florian HENRY
7b72965315 FIX incoterms 2016-07-28 16:48:16 +02:00
florian HENRY
c13c15188b FIX: incoterms do not output into crabe invoice PDF 2016-07-28 16:44:08 +02:00
Sergio Sanchis Climent
b47e6e4520 FIX #5544 Disabled Contact still appear in lists to send emails 2016-07-28 15:58:45 +02:00
Laurent Destailleur
e8b5fc5d06 Fix css to add bold border must be forced only when not previously done 2016-07-28 14:37:36 +02:00
Laurent Destailleur
629271cf85 FIX Bad position of parameters on llxHeader (so online help not visible) 2016-07-28 12:23:07 +02:00
Laurent Destailleur
e5d0258f33 Fix missing css 2016-07-28 12:22:23 +02:00
Laurent Destailleur
463a130a60 FIX #5457 2016-07-28 11:53:06 +02:00
Laurent Destailleur
0334b58a4b Hide feature not yet validated to be ready for a stable 4.0 2016-07-27 20:24:30 +02:00
Laurent Destailleur
fb8f0ed657 FIX #5503 2016-07-27 20:05:22 +02:00
Laurent Destailleur
2a28d77eeb FIX #5465 - Fix type account_parent 2016-07-27 19:53:16 +02:00
Laurent Destailleur
889b15689b FIX #5510 2016-07-27 19:42:09 +02:00
Laurent Destailleur
972baa34e7 FIX #5512 2016-07-27 19:36:17 +02:00
Laurent Destailleur
c242e53db6 FIX #5523 2016-07-27 19:23:40 +02:00
Laurent Destailleur
7e37cbb9e3 Fix resource module can't work because mandatory data not available. 2016-07-27 19:16:21 +02:00
Laurent Destailleur
0e79cae9d4 FIX #5534 2016-07-27 18:51:33 +02:00
Laurent Destailleur
968827172d FIX #5534 2016-07-27 18:49:34 +02:00
Laurent Destailleur
799226728d Fix default rule for margin is choice 3: so cost price, then pmp if not 
defined, then bestu supplier price if not defined
 2016-07-27 18:05:44 +02:00
Laurent Destailleur
12514d0f81 FIX #5543 2016-07-27 17:50:38 +02:00
Laurent Destailleur
58faf94dfc Fix doxygen 2016-07-27 17:41:21 +02:00
Laurent Destailleur
5fa8a6c311 Fix to avoid pb of performances 2016-07-27 17:40:19 +02:00
Laurent Destailleur
38471f1670 Fix: use reposition 2016-07-27 17:29:27 +02:00
Laurent Destailleur
3b1d6818b8 Update ldap translation 2016-07-27 17:26:04 +02:00
Laurent Destailleur
4d1885eb59 Fix: restore logout and logged translation key 2016-07-27 17:00:14 +02:00
Laurent Destailleur
eb06f56164 Fix bad version into error message 2016-07-27 16:49:00 +02:00
Laurent Destailleur
eddac89bad FIX Fatal error if curl not installed 2016-07-27 16:45:13 +02:00
Laurent Destailleur
f71b5d0605 FIX #5524 2016-07-27 14:19:13 +02:00
Laurent Destailleur
e4f51b7f32 FIX Select new thirdparty 2016-07-27 14:15:58 +02:00
Laurent Destailleur
03767286ef Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-27 12:32:01 +02:00
Laurent Destailleur
7dc01fc9c1 Fix hide this api 2016-07-27 12:26:32 +02:00
Laurent Destailleur
700421179f Merge pull request #5557 from aspangaro/4.0-p36 
FIX Presentation correction
 2016-07-27 11:15:40 +02:00
Laurent Destailleur
c23fe43b62 Merge pull request #5556 from olsesacl/#5516 
FIX #5516 PHP7 warning on supplier module's invoices configuration page
 2016-07-27 11:15:21 +02:00
Laurent Destailleur
198adcf440 Merge pull request #5555 from olsesacl/#5515 
FIX #5515 PHP7 warnings on project module's configuration page
 2016-07-27 11:14:50 +02:00
Laurent Destailleur
51566970ce Merge pull request #5554 from olsesacl/#5514 
FIX #5514 PHP7 Warning on barcode module's configuration page
 2016-07-27 11:13:49 +02:00
Laurent Destailleur
8959b13bc3 Merge pull request #5553 from olsesacl/#5511 
FIX #5511 Accessing Direct Printing Jobs clears left menu
 2016-07-27 11:13:28 +02:00
Laurent Destailleur
a790a97009 Merge pull request #5550 from olsesacl/#5519 
FIX #5519 Bug: Intervention resources tab issues fatal error
 2016-07-27 11:12:05 +02:00
Laurent Destailleur
86e4340287 FIX: More robust autodetection of relative url to redirect to make 
install when conf file does not exists yet.
 2016-07-27 10:57:05 +02:00
aspangaro
2e4bebbaf9 FIX Presentation correction 2016-07-27 07:24:36 +02:00
Sergio Sanchis Climent
227c6906a8 FIX #5516 2016-07-26 23:26:29 +02:00
Sergio Sanchis Climent
3b57727542 PHP7 warnings on project module's configuration page 2016-07-26 22:22:55 +02:00
Sergio Sanchis Climent
c9fa12a8f9 PHP7 Warning on barcode module's configuration page 2016-07-26 22:09:06 +02:00
Sergio Sanchis Climent
7eed738fce Fix: Accessing Direct Printing Jobs clears left menu 2016-07-26 21:53:03 +02:00
Marcos García de La Fuente
1ef27913d7 FIX #5549 getNomUrl tooltips show Order info even if user has no rights to read them 2016-07-26 17:07:56 +02:00
Laurent Destailleur
a167d56d5a Hard code a warning to avoid confusion. 2016-07-26 16:40:37 +02:00
Sergio Sanchis Climent
7481cfc1a3 FIX #5519 2016-07-26 16:35:54 +02:00
Laurent Destailleur
b615b52f47 FIX html detection fails if only u tag is present 2016-07-26 16:11:38 +02:00
Laurent Destailleur
2866d60240 Revert "change jsgantt to jsGanttImproved" 
This reverts commit caf963351b.
 2016-07-26 13:59:08 +02:00
Juanjo Menent
b4a88ca312 Merge pull request #5547 from olsesacl/#5520 
FIX #5520 Bug: JavaScript error on project Gantt view
 2016-07-26 11:59:48 +02:00
Laurent Destailleur
f0fa9205a2 Sync transifex 2016-07-26 09:56:20 +02:00
Sergio Sanchis Climent
caf963351b change jsgantt to jsGanttImproved 2016-07-26 01:59:27 +02:00
Laurent Destailleur
e0f5a3cfe9 Fix send email in mass action 2016-07-25 21:51:29 +02:00
Laurent Destailleur
fc1c38420c Revert "Fix Performance improvement with many extrafields" 
This reverts commit ae18178d56.
 2016-07-25 19:47:07 +02:00
Regis Houssin
d8f77abf31 Fix: missing sourcetype can create fault positive 2016-07-25 14:36:20 +02:00
Marcos García de La Fuente
3029fd0fe1 FIX #5540 getFormMail is not registered as addReplace hook 2016-07-25 13:18:41 +02:00
Marcos García de La Fuente
3ef3a038cf Merge branch '3.9' into bug-5537 2016-07-25 11:50:08 +02:00
Marcos García de La Fuente
a9d75b2c91 FIX #5537 AJAX project search does not work properly 2016-07-25 11:49:04 +02:00
Juanjo Menent
250d29542f Merge pull request #5527 from simnandez/3.9 
Fix Performance improvement with many extrafields
 2016-07-25 10:23:14 +02:00
Laurent Destailleur
834356b61e Fix missing opacity css 2016-07-24 22:24:18 +02:00
Laurent Destailleur
23753d849c FIX Data not lost when error during creation of leave request. 
Conflicts:
	htdocs/holiday/define_holiday.php
 2016-07-24 22:20:21 +02:00
Laurent Destailleur
9661f08b38 Fix filter on dates of services 2016-07-24 22:17:46 +02:00
Laurent Destailleur
50f76cbb9c Fix bad css 2016-07-24 22:17:40 +02:00
Laurent Destailleur
60c71d88f7 Fix missing loading admin langs 2016-07-23 14:30:48 +02:00
Laurent Destailleur
59e9d7f397 Fix the repositioning works better with new system class="reposition" 
compared to old system (#tag)
 2016-07-23 13:41:06 +02:00
Laurent Destailleur
343561be7a Fix colspan 2016-07-23 13:37:17 +02:00
Laurent Destailleur
867a0072e3 Fix forcing on module setup was not working 2016-07-23 13:20:34 +02:00
Laurent Destailleur
1b9b4395b9 Fix lost translation keys 2016-07-23 13:07:34 +02:00
Laurent Destailleur
b085ce6916 Fix lost translation keys 2016-07-23 13:01:42 +02:00
Laurent Destailleur
07d0f457b4 Fix: files generated by mass action could not be loaded 2016-07-23 12:44:28 +02:00
Laurent Destailleur
5bbd8eded9 Code comment 2016-07-22 18:32:45 +02:00
Laurent Destailleur
c0d8bce2df Prepare 3.8.5 2016-07-21 19:44:25 +02:00
Laurent Destailleur
1624894346 Fix missing load 2016-07-21 19:35:45 +02:00
Laurent Destailleur
f90946dbde Fix test on eat and sell date 2016-07-21 19:12:05 +02:00
Laurent Destailleur
80d99651a4 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
 2016-07-21 18:49:10 +02:00
Laurent Destailleur
3a08a14d56 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 18:45:53 +02:00
Laurent Destailleur
80354cd8d6 FIX Can correct stock of lot using eatby or sell by date 2016-07-21 18:43:44 +02:00
Laurent Destailleur
2d037eb34e FIX Direction of movement lost if an error occurs 2016-07-21 18:36:43 +02:00
Laurent Destailleur
441a8c4a74 FIX Can make a movement on "out of sell" products 2016-07-21 18:28:06 +02:00
Juanjo Menent
ae18178d56 Fix Performance improvement with many extrafields 2016-07-21 18:21:09 +02:00
Laurent Destailleur
42be661b1d Fix bad error message output 2016-07-21 17:36:59 +02:00
Laurent Destailleur
d71754f577 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-21 13:49:32 +02:00
Laurent Destailleur
058c431483 FIX The project was lost when creating the event "sent by email". Also, 
event company "create" was not tracked by default like others.
 2016-07-21 13:49:10 +02:00
Laurent Destailleur
ff9b2803e7 Fix if previous percent not defined, we do not try to show previous 
percent.
 2016-07-21 12:15:53 +02:00
Laurent Destailleur
0428d9c887 Merge pull request #5525 from aspangaro/4.0-p36 
Fix: Presentation on thirdparty card
 2016-07-21 10:42:56 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
 2016-07-21 10:30:51 +02:00
Laurent Destailleur
972d998f7e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 10:25:03 +02:00
Laurent Destailleur
9ebe704506 Merge pull request #5422 from atm-alexis/FIX_3.9_bug_5128 
FIX #5128 if create method return duplicated code error
 2016-07-21 09:55:26 +02:00
aspangaro
52e5403660 Fix: Presentation on thirdparty card 2016-07-21 06:25:25 +02:00
Laurent Destailleur
6e1d7aebb3 Merge pull request #5504 from simnandez/4.0 
Fix bad param name to test if showing selector for suppliers
 2016-07-20 18:15:54 +02:00
Laurent Destailleur
918bc9cc26 Fix: If user can approve, show button to deny to. 2016-07-20 16:07:15 +02:00
Laurent Destailleur
ffa1102949 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-20 02:16:22 +02:00
Laurent Destailleur
01c140ecac FIX External user must not be able to edit its discounts 2016-07-20 02:16:10 +02:00
florian HENRY
5ea72c8d56 FIX : cannot update bank account on invoice if module order not 
activated
 2016-07-19 07:46:27 +02:00
Juanjo Menent
7479933c27 Merge remote-tracking branch 'upstream/4.0' into 4.0 2016-07-18 18:44:45 +02:00
Juanjo Menent
c5ebb8f983 Fix bad param name to test if showing selector for suppliers 2016-07-18 18:44:05 +02:00
Laurent Destailleur
038526bb71 Code comment 2016-07-18 14:40:10 +02:00
Laurent Destailleur
fd7c494cb6 Add VAT for cyprus 2016-07-18 13:20:04 +02:00
Laurent Destailleur
621a29d0e0 Fix account may contains text 2016-07-18 12:01:25 +02:00
Laurent Destailleur
10cd5ba730 Fix sort of sent notification by date desc 2016-07-18 11:54:35 +02:00
Laurent Destailleur
9a0367db0d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-18 11:51:51 +02:00
Laurent Destailleur
5e654e8cb3 Fix help 2016-07-18 11:49:34 +02:00
Juanjo Menent
e5235be7d0 Merge pull request #5500 from atm-florian/4.0_fix_updateline_multicurrency 
FIX : class FactureLine fetch() and update() crash
 2016-07-18 08:56:15 +02:00
florian HENRY
d3344f5291 sd 2016-07-18 07:48:32 +02:00
florian HENRY
bc4674bdce fix problem with call update method after fetch on invocie lines 2016-07-18 07:37:18 +02:00
Juanjo Menent
c37c3d1939 Merge pull request #5496 from olsesacl/3.8_#5450 
Fix #5450 Bug: Expenses Form : SQL error on updating line
 2016-07-17 15:46:03 +02:00
Laurent Destailleur
1914b98375 Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-17 12:52:20 +02:00
Sergio Sanchis Climent
e52d6db3fd Fix #5450 2016-07-17 12:18:29 +02:00
Juanjo Menent
9973f03f3b Merge pull request #5499 from aspangaro/4.0-p34 
Fix: Accountancy - Problem with empty accountancy acccount in create / update mode
 2016-07-17 09:37:01 +02:00
aspangaro
90a84335ab Fix: Missing key language on home for boxes 2016-07-17 07:34:19 +02:00
aspangaro
e6da7c5574 Fix: Accountancy - Problem with empty accountancy acccount in create / modify mode 2016-07-17 07:09:17 +02:00
Sergio Sanchis Climent
3b56370060 Fix #5450 2016-07-17 02:48:04 +02:00
Xebax
8a303fd4d8 FIX #5493 The login field is ignored when doing a "search in all" for 
members.
 2016-07-16 20:16:46 +02:00
Juanjo Menent
1232e25859 FIX #5474 Country_id of "Don" object is still empty 2016-07-16 20:00:55 +02:00
Sof
4d86291527 Fix : syntax error 2016-07-16 19:57:41 +02:00
Laurent Destailleur
d0380adc39 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php
 2016-07-16 19:54:57 +02:00
Laurent Destailleur
87c31d0761 Prepare 3.9.3 2016-07-16 19:38:58 +02:00
Laurent Destailleur
931531232c FIX duplicate jquery.js files 2016-07-16 19:38:18 +02:00
Laurent Destailleur
e299bad2b5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-16 19:20:15 +02:00
Laurent Destailleur
6f489c1fbd FIX Missing original .js file (license violation if sources are not 
provided)
 2016-07-16 19:19:52 +02:00
Juanjo Menent
5aa63ffe73 Merge pull request #5490 from simnandez/4.0 
FIX #5479 using uninitialized variable $socid and other stuffs
 2016-07-16 19:15:39 +02:00
Laurent Destailleur
970c4bea75 Fix minor css 2016-07-16 15:34:09 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
4b854fb33d Fix better error message when possible refering objects list is empty. 2016-07-16 14:37:35 +02:00
Laurent Destailleur
68227d91d9 FIX after enabling module expense report, the document template is not 
active by default.
 2016-07-16 14:14:28 +02:00
Juanjo Menent
a037e2f2d6 FIX #5479 using uninitialized variable $socid and other stuffs 2016-07-15 23:14:15 +02:00
Juanjo Menent
2ed446d014 FIX Option strict mode compatibility 2016-07-15 19:35:01 +02:00
Laurent Destailleur
0c5851d566 Fix CRLF 2016-07-15 14:49:48 +02:00
Laurent Destailleur
0f4f4ea61c FIX #5482 #5485 2016-07-15 14:22:49 +02:00
Laurent Destailleur
fdfe4d9ac5 Fix missing getFormMail as "addreplace" hook 2016-07-15 14:21:07 +02:00
Laurent Destailleur
258662e616 Fix: missing month of update in leave "view log" page. 2016-07-14 15:31:56 +02:00
Laurent Destailleur
241fd8db98 Fix css 2016-07-14 15:22:04 +02:00
Laurent Destailleur
9bd937a3bc Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-14 00:35:59 +02:00
Laurent Destailleur
10e7fa51fc Fix missing parameters to provide all information required for 
substitution hooks
 2016-07-13 23:06:41 +02:00
Laurent Destailleur
dc51eb0b75 Fix missing badge 2016-07-13 22:21:18 +02:00
Juanjo Menent
015b941966 Merge pull request #5478 from simnandez/4.0 
Merge #5464 Fix: Prevent SQLiFix into 4.0
 2016-07-13 12:45:17 +02:00
Laurent Destailleur
c787e7f2a1 FIX Clear of filter should also reset categories and extrafields filter 
FIX Filter on categories should depends on context
 2016-07-13 12:03:30 +02:00
Juanjo Menent
fc5b308605 Merge remote-tracking branch 'upstream/develop' into 4.0 2016-07-13 12:00:50 +02:00
Juanjo Menent
df74fa37de Merge pull request #5464 from AppChecker/develop 
Fix: Prevent SQLi
 2016-07-13 08:45:00 +02:00
Laurent Destailleur
490336b2e8 Fix bad dependency. 2016-07-12 20:07:53 +02:00
Laurent Destailleur
73f574b649 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/repair.php
 2016-07-12 19:30:01 +02:00
Laurent Destailleur
baeedd3690 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-12 19:26:55 +02:00
Laurent Destailleur
f972b15f5f FIX #5068 2016-07-12 19:22:14 +02:00
Alexis Algoud
572b2fdec7 FIX dasboard wrong for late invoice 2016-07-12 15:01:43 +02:00
Laurent Destailleur
9c06e07f07 Code comment 2016-07-12 13:03:56 +02:00
Laurent Destailleur
dc138e20e7 FIX: Can't edit label 2016-07-12 10:58:32 +02:00
Laurent Destailleur
1756fdbc9f Popup on links not visible. 2016-07-11 12:59:07 +02:00
appchecker
f618f330b3 replace intval with GETPOST 2016-07-11 13:01:16 +03:00
appchecker
7facaac973 replace intval with GETPOST 2016-07-11 12:58:59 +03:00
appchecker
4b1dfbc2fb replace intval with GETPOST 2016-07-11 12:56:05 +03:00
Laurent Destailleur
b72123e7ec Fix custom code must be visible only for products 2016-07-11 11:43:59 +02:00
Laurent Destailleur
329bdfc9fd FIX We must take last recent price when using several level of prices 2016-07-11 11:35:38 +02:00
Laurent Destailleur
d5f221452e Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-11 11:34:28 +02:00
Laurent Destailleur
0367cee671 FIX We must take the last recent defined price when using price level 2016-07-11 11:34:11 +02:00
Laurent Destailleur
7e000d4ce2 Fix missing css opacitymedium 2016-07-11 10:46:44 +02:00
Laurent Destailleur
1efedbdade Fix badge on project tab 2016-07-11 10:37:43 +02:00
Laurent Destailleur
2e372ced1e Fix missing fields 2016-07-11 10:28:57 +02:00
Laurent Destailleur
1f7bc1d518 FIX Bad sort link on ECM module for automatic tab 2016-07-11 02:06:46 +02:00
Laurent Destailleur
914d56bb1b Fix css for last chrome versions. max-width: 0 fails on box 2016-07-09 16:54:04 +02:00
Laurent Destailleur
db7f7a420b Fix loading language 2016-07-09 16:12:35 +02:00
Laurent Destailleur
c6ab11a9e5 Fix translation 2016-07-09 15:44:03 +02:00
Laurent Destailleur
2ec7d47869 Fix css 2016-07-09 15:35:49 +02:00
Laurent Destailleur
bfb48ecce9 Where is the info tab of project ? 2016-07-09 15:30:42 +02:00
Laurent Destailleur
a258663175 Fix edition of status were loosing old percent. We show it to allow user 
to keep it if required.
 2016-07-09 14:58:51 +02:00
Marcos García de La Fuente
d01796a214 FIX #5470 User of expense report in bank transactions page is not correct 2016-07-09 14:31:41 +02:00
Laurent Destailleur
03dbf6e747 Fix edit of progess only 2016-07-09 14:28:33 +02:00
Laurent Destailleur
0e4dcb301c Fix several bugs into projects 2016-07-09 13:58:46 +02:00
Laurent Destailleur
8504e09e72 Fix permission to enter time spent 2016-07-09 12:35:12 +02:00
Laurent Destailleur
e228d8e549 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-09 12:09:35 +02:00
Laurent Destailleur
93c9e81c33 Fix better size on list 2016-07-09 12:05:09 +02:00
Laurent Destailleur
47d7ac8031 Fix the repair tool to correct corrupted stock for batch numbers 2016-07-08 23:11:55 +02:00
Laurent Destailleur
a48c79b68b Fix corrupted stock 2016-07-08 23:02:25 +02:00
Laurent Destailleur
0f23cef46c Fix warning of the repair tool. 2016-07-08 18:59:36 +02:00
philippe grand
bc5b9bd8a2 internationalization of code comment 2016-07-08 18:24:55 +02:00
Laurent Destailleur
d8d938e82c Fix performance problems Enter new time spent duration becoma < 1s 
instead of 30s with 5000 tasks.
 2016-07-08 17:06:12 +02:00
Laurent Destailleur
298c55b3ed Fix bad property set. Must set fk_task_parent not fk_parent. 2016-07-08 16:22:16 +02:00
Laurent Destailleur
a95335d869 Fix missing ref of task 2016-07-08 16:20:11 +02:00
Laurent Destailleur
999341c1a2 Better performance 2016-07-08 12:02:09 +02:00
Laurent Destailleur
d940cc392a FIX Several fix to exclude WON/LOST of reporting of opportunities amount 
(sometimes we need, sometimes not).
 2016-07-08 10:59:13 +02:00
appchecker
2c297bbcc8 prevent SQLi 2016-07-07 20:25:15 +03:00
appchecker
9895084627 prevent SQLi 2016-07-07 20:23:38 +03:00
appchecker
931089a924 prevent SQLi 2016-07-07 20:19:05 +03:00
Laurent Destailleur
f911450017 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-07 18:56:39 +02:00
Laurent Destailleur
fec2d86ec5 Fix substitution of __THIRDPARTY_NAME__ failed 2016-07-07 18:56:10 +02:00
Juanjo Menent
9c63a7497d Merge pull request #5461 from mrsof/patch-1 
FIX: Missing semicolon
 2016-07-07 17:23:59 +02:00
Juanjo Menent
043ff934fb Merge pull request #5459 from atm-florian/fix_syntax 
fix syntax 'year' instead of '$year'
 2016-07-07 17:22:15 +02:00
Juanjo Menent
df16aaea0c Merge pull request #5460 from atm-florian/fix_bug_introduceby_97eedb8 
FIX : warning on urlencode into main.inc.php
 2016-07-07 17:21:57 +02:00
Laurent Destailleur
9192587ef2 Fix duplicate records 2016-07-07 16:57:57 +02:00
Laurent Destailleur
5ebbe02853 Fix missing trackid into parameters of hooks 2016-07-07 16:26:00 +02:00
Laurent Destailleur
56e374ff0d Fix remove warnings 2016-07-07 15:41:11 +02:00
Laurent Destailleur
24a798ed2f Fix restore translation for ModuleCompanyCode... 2016-07-07 14:13:33 +02:00
Laurent Destailleur
3566c3fd6e Fix bad link 2016-07-07 11:31:07 +02:00
Laurent Destailleur
3c6c509358 Fix compatibility with old behaviour (direct open of card after a 
search)
 2016-07-07 10:26:40 +02:00
Sof
9b5bcc6dcd FIX: Missing semicolon 2016-07-07 10:25:17 +02:00
Laurent Destailleur
2af7a8c584 Transifex sync 2016-07-07 10:06:35 +02:00
florian HENRY
96172a5910 better syntax 2016-07-07 09:49:27 +02:00
florian HENRY
240dcc78fb fix php warning introduce by 97eedb866b 
urlencode cannot deal with array
 2016-07-07 09:47:12 +02:00
florian HENRY
1957af52b1 fix syntax 2016-07-07 09:23:43 +02:00
Laurent Destailleur
63ad970a27 Sync transifex 2016-07-07 04:26:22 +02:00
Laurent Destailleur
804159f3f3 Fix language files 2016-07-07 04:11:27 +02:00
Laurent Destailleur
f756f3db0e Fix hook context 'all' 2016-07-07 01:23:20 +02:00
Laurent Destailleur
b2d4fb94d6 Fix wrapping of left menu for menu titles 2016-07-07 00:34:59 +02:00
Laurent Destailleur
d7bc30fc4e Prepare DoliWamp 4.0 2016-07-06 23:18:01 +02:00
Laurent Destailleur
d22ef4f371 Fix Do not show status 2016-07-06 22:35:12 +02:00
Regis Houssin
4503659cba Fix: wrong multicompany filter 2016-07-06 16:50:10 +02:00
Laurent Destailleur
061ccadd03 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/list.php
	htdocs/fourn/commande/orderstoinvoice.php
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
	htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
Laurent Destailleur
8505c5db09 Code comment 2016-07-06 13:26:49 +02:00
Laurent Destailleur
148f2e4c00 Merge pull request #5449 from fmarcet/3.8 
Fix: Don't load extrafields on orderstoinvoice
 2016-07-06 11:56:05 +02:00
Laurent Destailleur
840601a491 Merge pull request #5451 from grandoc/develop 
internationalization of code comment
 2016-07-06 11:53:37 +02:00
Laurent Destailleur
646e6f4996 Merge pull request #5454 from atm-alexis/FIX_develop_add_post_into_print_link 
FIX add POST key on print link
 2016-07-06 11:49:45 +02:00
Laurent Destailleur
759b265eeb Merge pull request #5447 from atm-florian/dev_fix5446 
FIX #5446 Extrafields select list filter on other select list do not work
 2016-07-06 11:46:21 +02:00
Laurent Destailleur
16c1816e7c Merge pull request #5445 from atm-florian/develop 
FIX hidden extrafield feature edit
 2016-07-06 11:35:19 +02:00
Laurent Destailleur
f39558ebb0 Fix ĉonf not defined 2016-07-06 11:24:51 +02:00
Laurent Destailleur
0af555126c Fix PHPCS 2016-07-06 11:23:32 +02:00
Laurent Destailleur
8e9a7cb629 Fix var not always defined 2016-07-06 11:20:09 +02:00
Laurent Destailleur
c360189d94 Code comment 2016-07-06 11:14:17 +02:00
Alexis Algoud
97eedb866b FIX add POST key on print link (avoid action in case of) 
in order to keep filter on list and other case
 2016-07-06 10:36:58 +02:00
Laurent Destailleur
da5228aaa9 Selection of fields ok for interventions 2016-07-06 10:28:34 +02:00
Laurent Destailleur
10885f0cf2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-06 09:58:15 +02:00
Laurent Destailleur
6749e60079 Fix: Test to manage corrupted data 2016-07-05 18:36:10 +02:00
Laurent Destailleur
a669b61b69 Code comment 2016-07-05 18:33:13 +02:00
philippe grand
770da29de4 internationalization of code comment 2016-07-05 17:20:32 +02:00
fmarcet
50c5efc374 Fix: Don't load extrafields on orderstoinvoice 2016-07-05 16:41:46 +02:00
Laurent Destailleur
b4c8822281 Fix style of text after ref on invoices 2016-07-05 16:27:14 +02:00
Maxime Kohlhaas
d658e2cf31 FIX task ODT company object not correctly retrieved 2016-07-05 16:04:18 +02:00
florian HENRY
fc2e7fb1ad FIX #5446 2016-07-05 15:45:33 +02:00
florian HENRY
22f028d101 FIX hidden extrafield feature edit 2016-07-05 09:05:10 +02:00
Laurent Destailleur
23cac5b157 FIX link to check prof id was hardcoded instead of using dedicated 
function
 2016-07-04 10:28:11 +02:00
Laurent Destailleur
c24d68a038 Picto for expense report 2016-07-03 21:14:45 +02:00
Laurent Destailleur
9992704398 Fix: viewimage must not check login for resources medias 2016-07-03 20:50:28 +02:00
Laurent Destailleur
de157d9099 Fix quick search on tasks 2016-07-03 20:15:26 +02:00
Laurent Destailleur
e9797538b3 Merge pull request #5432 from atm-florian/3.9 
FIX #4926
 2016-07-02 20:31:58 +02:00
Laurent Destailleur
6a903b17e6 Merge pull request #5440 from frederic34/patch-8 
FIX Search on billed
 2016-07-02 20:30:51 +02:00
Laurent Destailleur
29cbab1647 Merge pull request #5438 from atm-arnaud/FIX_product_blocstat_without_module_enabled 
FIX product stats all bloc module without enabled test
 2016-07-02 20:29:41 +02:00
Scrutinizer Auto-Fixer
a8b1699abb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-07-02 18:26:31 +00:00
Laurent Destailleur
3d72f788b9 Fix phpcs 2016-07-02 18:02:39 +02:00
Laurent Destailleur
fe86ef5774 Thirdparty into keyword, encoded with convToOutputCharset 2016-07-02 17:00:45 +02:00
Laurent Destailleur
9a75d40d56 Fix switching between web sites 2016-07-02 12:21:47 +02:00
Laurent Destailleur
525b2cf297 Fix: Edition of contract on intervention failed 2016-07-02 12:02:51 +02:00
Laurent Destailleur
7d9671f6d3 Fix bad separator in url 2016-07-02 11:44:46 +02:00
Laurent Destailleur
3eaf0bc4bf Fix bad translation 2016-07-02 11:32:06 +02:00
Laurent Destailleur
76d24ac8ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-02 11:27:13 +02:00
Laurent Destailleur
91d2d573c3 Fix NNE has been replaced with ICS 2016-07-02 11:26:55 +02:00
Frédéric FRANCE
0639bafa6b Update list.php 2016-07-02 10:19:38 +02:00
Laurent Destailleur
c8c51dd96d Fix clone of intervention was not cloning lines. 2016-07-01 19:15:30 +02:00
Laurent Destailleur
02e35f8c76 Fix where is the clone of intervention ? 2016-07-01 18:16:26 +02:00
Laurent Destailleur
0e7889a68c Fix must show label of leave type and not id. 2016-07-01 17:53:16 +02:00
Laurent Destailleur
59f86a12d2 Fix delete of documents generated on project. 
Fix missin translation
 2016-07-01 17:49:13 +02:00
Laurent Destailleur
e557502504 Fix save of stock limit failed 2016-07-01 17:34:49 +02:00
arnaud
cf5de9d0c8 FIX form_confirm to delete payment on supplier invoice 2016-07-01 16:59:03 +02:00
arnaud
09b824d819 FIX product stats all bloc module without enbaled test 2016-07-01 16:44:05 +02:00
florian HENRY
2520ee921a llx_ecm_directories 2016-07-01 08:37:24 +02:00
florian HENRY
08fbc21bb1 llx_ecm_directories 2016-07-01 08:36:20 +02:00
florian HENRY
7118c8b39b Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9 2016-07-01 08:34:10 +02:00
florian HENRY
bfcc72b8d8 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2016-07-01 08:33:45 +02:00
Laurent Destailleur
b12bd9b070 Merge remote-tracking branch 'origin/3.9' into develop 2016-07-01 03:51:59 +02:00
Laurent Destailleur
45767b9b6b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-01 03:51:45 +02:00
Laurent Destailleur
f8b1d0d7ca Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-01 03:51:23 +02:00
Laurent Destailleur
38d6438bd5 Merge pull request #5417 from atm-florian/dev_fix5416 
FIX :#5416
 2016-07-01 03:45:38 +02:00
Laurent Destailleur
15e79cf089 Merge pull request #5411 from atm-alexis/FIX_develop_compatibility 
FIX old method add have to return create method result
 2016-07-01 03:44:18 +02:00
Laurent Destailleur
07fd911770 Merge pull request #5401 from atm-alexis/FIX_3.8_bug_5383 
# FIX #5383 bad object id on don delete
 2016-07-01 03:42:59 +02:00
Laurent Destailleur
2c5e1c17fe Fix hard coded table prefix 2016-07-01 03:42:19 +02:00
Laurent Destailleur
62d7303d8f Add comment 2016-07-01 03:40:48 +02:00
Laurent Destailleur
74378e2c65 Merge pull request #5407 from atm-alexis/FIX_3.8_bug_5338 
FIX #5338 use of not initialized var $aphour, $apmin, etc
 2016-07-01 03:27:26 +02:00
Laurent Destailleur
5713d293e3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-01 03:22:16 +02:00
Laurent Destailleur
625213580c Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-07-01 03:17:20 +02:00
Laurent Destailleur
9e82a8b4e6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-01 03:12:02 +02:00
Laurent Destailleur
102179028c FIX #5414 2016-07-01 03:11:41 +02:00
Laurent Destailleur
3645bd8f69 Merge pull request #5420 from atm-alexis/FIX_3.8_bug_5170 
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
 2016-07-01 03:06:31 +02:00
Laurent Destailleur
1d0e14be62 Merge pull request #5423 from atm-alexis/FIX_3.9_bug_4964 
FIX #4964 buyprice in customer from shipping
 2016-07-01 02:52:15 +02:00
Laurent Destailleur
6066b711af Merge pull request #5427 from atm-geoffrey/FIX_project_select_on_event 
Fix #4828
 2016-07-01 02:47:43 +02:00
Laurent Destailleur
05384b2f88 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/list.php
	htdocs/projet/card.php
	htdocs/societe/consumption.php
 2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/sendings.lib.php
 2016-07-01 02:06:30 +02:00
Laurent Destailleur
c9300bae35 Merge pull request #5415 from fmarcet/3.8 
Fix: Incorrect document link on supplier invoices's list
 2016-06-30 22:31:18 +02:00
Laurent Destailleur
a439661ac7 Merge pull request #5421 from atm-arnaud/fix_5004 
FIX #5004
 2016-06-30 22:23:53 +02:00
Laurent Destailleur
5c11192c7c Merge pull request #5425 from atm-arnaud/fix_4749 
FIX #4749
 2016-06-30 22:20:18 +02:00
Laurent Destailleur
f3821c30f3 Merge pull request #5412 from atm-florian/dev_compta 
Dev compta
 2016-06-30 21:58:45 +02:00
Laurent Destailleur
d4226a038e Merge pull request #5418 from atm-maxime/fix_time_spent_right 
FIX #5319
 2016-06-30 21:56:25 +02:00
Laurent Destailleur
3ddd56a326 Merge pull request #5410 from frederic34/patch-8 
FIX Bad link on supplier orders area
 2016-06-30 21:40:45 +02:00
Laurent Destailleur
f2bb51ad02 Merge pull request #5406 from atm-gauthier/3.8_fix_linked_receiving 
FIX : receiving link never works
 2016-06-30 21:38:29 +02:00
Laurent Destailleur
03c420b34e Merge pull request #5403 from atm-florian/dev_fixwarning 
Fix box PHP strict warning
 2016-06-30 21:34:26 +02:00
Laurent Destailleur
578a58527f Merge pull request #5430 from atm-arnaud/fix_4455 
FIX #4455
 2016-06-30 21:32:17 +02:00
Laurent Destailleur
db0b806c7b Merge pull request #5434 from atm-florian/dev_fix4672 
Dev fix4672
 2016-06-30 21:00:48 +02:00
Laurent Destailleur
4023da5a3f Merge pull request #5435 from atm-florian/dev_fix4793 
Cannot reproduce 4793 still fix other bug on PgSQL
 2016-06-30 20:58:27 +02:00
Laurent Destailleur
ae1fd5bbb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-30 19:35:49 +02:00
Laurent Destailleur
3611161b67 Fix custom code should not appears on services 2016-06-30 19:35:11 +02:00
florian HENRY
215f397f33 Cannot reproduce 4793 still fix other bug on PgSQL 2016-06-30 17:28:13 +02:00
florian HENRY
37ee64ae9b fix 4672 2016-06-30 17:10:06 +02:00
Maxime Kohlhaas
d004f3a538 FIX #4448 $filebonprev is not used, $this->filename now 2016-06-30 17:03:56 +02:00
florian HENRY
855550e274 FIX 4926 2016-06-30 17:00:09 +02:00
florian HENRY
8097298c80 FIX #4756 2016-06-30 16:55:59 +02:00
arnaud
38dcb0de49 FIX #4455 2016-06-30 16:53:24 +02:00
florian HENRY
388bd5ca48 code review 2016-06-30 16:42:49 +02:00
Maxime Kohlhaas
aa67a29115 FIX #4383 $userid not defined 2016-06-30 16:40:38 +02:00
atm-geoffrey
75bb161930 FIX #4828 2016-06-30 16:20:53 +02:00
arnaud
0ffe106e2c FIX #4749 2016-06-30 16:03:48 +02:00
Alexis Algoud
02169478d0 FIX #4964 buyprice in customer from shipping 
buyprice wasn't load in expedition::fetch_lines
 2016-06-30 15:30:07 +02:00
Alexis Algoud
fa73dbe8e9 FIX #5128 if create method return duplicated code error 
not use GETPOST in order to get a new code
 2016-06-30 15:12:35 +02:00
arnaud
97fe75f198 FIX #5004 2016-06-30 14:57:23 +02:00
Alexis Algoud
22bc44620b FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option 2016-06-30 14:27:58 +02:00
florian HENRY
542be965b3 add log and toher multicurrency bug fix for PgSQL 2016-06-30 14:24:55 +02:00
Maxime Kohlhaas
c73c1a577a Time spent can be saved with project read right 2016-06-30 14:24:03 +02:00
florian HENRY
1740166d28 FIX :#5416 2016-06-30 14:16:41 +02:00
fmarcet
e4a2b5abb3 Fix: Incorrect document link on supplier invoices's list 2016-06-30 11:27:29 +02:00
Laurent Destailleur
5950178c7a Fix create of admin user 2016-06-30 00:38:13 +02:00
Laurent Destailleur
0be23553a4 Fix menu closing 2016-06-29 19:43:42 +02:00
Laurent Destailleur
f7427e7366 Fix css 2016-06-29 18:15:35 +02:00
Laurent Destailleur
e8b4a3a8ae Code comment 2016-06-29 17:34:13 +02:00
florian HENRY
34fddbf3bc addd export cogilog 2016-06-29 17:30:47 +02:00
Laurent Destailleur
d1850be261 Fix conflict in leftmenu value for projet menu 2016-06-29 17:00:05 +02:00
florian HENRY
9b044ec5ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_compta 2016-06-29 16:55:59 +02:00
florian HENRY
ea3e851ec0 Fix stuff in accoutancy 2016-06-29 16:54:37 +02:00
Alexis Algoud
a55a166df3 FIX old method add have to return create method result for backward compatibility 2016-06-29 16:30:47 +02:00
Frédéric FRANCE
76a113257e Update index.php 2016-06-29 16:16:56 +02:00
Laurent Destailleur
5f5328c3d8 FIX Link in menu when using left menu editor was wrong. 
FIX Updating an entry with menu editor did not save fk_leftmenu.
 2016-06-29 14:09:18 +02:00
Laurent Destailleur
ab444af8c2 Fix bad css 2016-06-29 13:38:19 +02:00
Laurent Destailleur
933ec6c118 FIX detection of HTML content when only p tag is present. 2016-06-29 13:14:53 +02:00
Laurent Destailleur
dcfc385645 Fix to avoid blocking error in auto upgrade process 2016-06-29 12:26:01 +02:00
Laurent Destailleur
1e9cee1b07 Fix bug reported by scrutinizer 2016-06-29 11:48:28 +02:00
Laurent Destailleur
8bcd2e581f Fix of bugs reported by scrutinizer 2016-06-29 11:20:48 +02:00
florian HENRY
dfc4f3e7fe on going accountacy working 2016-06-29 11:06:02 +02:00
Laurent Destailleur
4708f0114c Clean code 2016-06-29 10:05:05 +02:00
Laurent Destailleur
6c0f842843 Missing translation 2016-06-28 17:53:59 +02:00
Laurent Destailleur
2c97d0855a Fix: On template invoice, edition of line was not complete. 2016-06-28 17:51:29 +02:00
Alexis Algoud
7e8506e25f FIX #5338 use of not initialized var $aphour, $apmin, etc 2016-06-28 13:25:47 +02:00
gauthier
d9035e5308 FIX : receiving link never works 2016-06-28 11:41:23 +02:00
florian HENRY
1fdd434528 fix travis 2016-06-28 09:52:27 +02:00
Laurent Destailleur
9b1caefbf9 Fix bad var 2016-06-28 02:40:42 +02:00
Laurent Destailleur
b529a53501 Fix var not initialized 2016-06-28 02:36:40 +02:00
Laurent Destailleur
5aa561598f Fix exit into functions 2016-06-28 02:22:01 +02:00
Laurent Destailleur
7d2d38d7b5 Maj trad 2016-06-27 16:16:28 +02:00
Laurent Destailleur
9ec31aea0a Use a more common translation 2016-06-27 15:28:19 +02:00
florian HENRY
d0be7877d3 Fix box PHP strict warning 2016-06-27 13:57:10 +02:00
Alexis Algoud
eb9d26a9e0 FIX #5383 bad object id on don delete 2016-06-27 11:36:13 +02:00
Laurent Destailleur
d6e15fe8f3 Increase max size of number of product into list 2016-06-26 23:15:20 +02:00
Laurent Destailleur
bc38bc63ca Fix minor bug in direct printing with google cloud print 2016-06-26 21:18:44 +02:00
Laurent Destailleur
8878c73732 Fix: link to other elements must be at end everywhere 2016-06-26 12:07:24 +02:00
Laurent Destailleur
d23a8a56ea Fix must use the constant, not hard coded value. 2016-06-25 21:40:45 +02:00
Laurent Destailleur
09a868af3f FIX: Sync of password must follow same rule 'crypted or not' on both 
sides (user and member)
 2016-06-25 21:28:52 +02:00
Laurent Destailleur
f021a8ca31 FIX Bad error management into trigger of mailmanspip 2016-06-25 18:48:50 +02:00
Laurent Destailleur
a8ba8e612a Missing translation 2016-06-25 15:56:03 +02:00
Laurent Destailleur
9fb4df2ef8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-25 15:27:26 +02:00
Laurent Destailleur
5898fdb813 A more complete example 2016-06-25 15:27:16 +02:00
Laurent Destailleur
413409737b Merge pull request #5400 from frederic34/patch-8 
typo
 2016-06-25 15:18:35 +02:00
Laurent Destailleur
266fef40ad Add a way to enhance security check. 2016-06-25 15:16:32 +02:00
Laurent Destailleur
945fcc7586 FIX Better support of GROUP_CONCAT for postgresql 2016-06-25 14:38:10 +02:00
Laurent Destailleur
f090100790 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-25 14:20:34 +02:00
Laurent Destailleur
5222b78e95 FIX property of bank account were lost if an error occured during 
saving.
 2016-06-25 14:20:23 +02:00
Frédéric FRANCE
7004dfbc15 typo 2016-06-25 09:57:46 +02:00
Laurent Destailleur
4856010400 Try to fix the group_concat function for pgsql. 2016-06-25 02:30:12 +02:00
Laurent Destailleur
9ebf7a1e35 Try to fix the group_concat function for pgsql. 2016-06-25 02:21:54 +02:00
Laurent Destailleur
b6700c70d6 Merge pull request #5399 from atm-geoffrey/fix_PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS 
FIX Hide a non relevant message when PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is on on project edit view
 2016-06-24 21:54:36 +02:00
Laurent Destailleur
aa1207d77a Merge pull request #5398 from atm-geoffrey/fix_project_clone_extrafields 
FIX extrafields cloned on project clone
 2016-06-24 21:53:02 +02:00
Laurent Destailleur
1368e6d462 Fix: error message was not enough to understand 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-06-24 21:32:38 +02:00
Laurent Destailleur
f97b67db6b Fix: error message was not enough to understand 2016-06-24 17:04:59 +02:00
Laurent Destailleur
2767df2e01 FIX Solve problem of sending joinded files of another email when several 
tabs are opened on form to send emails.
 2016-06-24 16:10:52 +02:00
geoffrey.girard
321ccce438 Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS on project edit view 2016-06-24 15:57:08 +02:00
Laurent Destailleur
6033b09344 FIX: A constructor must not return a value. 
FIX: A topic is required to send an email (probability to be spam of
99%)
 2016-06-24 15:36:20 +02:00
geoffrey.girard
0a5ded20a3 FIX extrafield cloned on project clone 2016-06-24 15:27:47 +02:00
Laurent Destailleur
0bf0937cc6 FIX: disabled templates must be not visible. 2016-06-24 13:08:34 +02:00
Laurent Destailleur
e144df759c FIX forced bank account was lost on proposal 
Fix Invoice was using duplicated bugged code for pdf removal link.
 2016-06-24 12:50:50 +02:00
Laurent Destailleur
e8eee05962 Cleaner css 2016-06-24 03:05:51 +02:00
Laurent Destailleur
3b38e5a870 FIX Withdraw request should not be possible if amount is negative. 2016-06-24 03:00:34 +02:00
Laurent Destailleur
453c6264bf FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly 2016-06-24 02:19:41 +02:00
Laurent Destailleur
eddab57f32 Minor css fix 2016-06-24 01:00:37 +02:00
Laurent Destailleur
227bdb9838 FIX extrafields was not visible on tab "subscription" 
FIX Link between membership and invoice was not saved
 2016-06-24 00:45:35 +02:00
Laurent Destailleur
d72d22cda4 Fix confusing translation 2016-06-23 23:22:30 +02:00
Laurent Destailleur
2e4c6597d8 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:05:00 +02:00
Laurent Destailleur
f6119cfee8 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:03:08 +02:00