Marcos García de La Fuente
2393e7c732
Moved creation poll wizard out of public folder
2014-01-05 19:03:33 +01:00
Marcos García de La Fuente
8d96675607
Force logged user to create surveys and applied Dolibarr style to poll creation wizard
2014-01-05 09:08:42 +01:00
Marcos García de La Fuente
6397b0b7aa
Improving the use of permissions in opensurvey module
2014-01-05 06:18:26 +01:00
Marcos García de La Fuente
694fd5810a
Removed unuseful opensurvey admin page
2014-01-03 00:44:56 +01:00
Laurent Destailleur
504b519fb7
Fix: Bad link for download file into documents page of supplier invoices
2014-01-01 18:37:06 +01:00
Laurent Destailleur
eadccb5d9b
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/langs/bg_BG/main.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/et_EE/admin.lang
htdocs/langs/et_EE/agenda.lang
htdocs/langs/et_EE/banks.lang
htdocs/langs/et_EE/bills.lang
htdocs/langs/et_EE/commercial.lang
htdocs/langs/et_EE/companies.lang
htdocs/langs/et_EE/compta.lang
htdocs/langs/et_EE/dict.lang
htdocs/langs/et_EE/help.lang
htdocs/langs/et_EE/main.lang
htdocs/langs/et_EE/margins.lang
htdocs/langs/et_EE/other.lang
htdocs/langs/et_EE/stocks.lang
htdocs/langs/et_EE/suppliers.lang
htdocs/langs/et_EE/users.lang
htdocs/langs/et_EE/withdrawals.lang
htdocs/langs/lv_LV/admin.lang
htdocs/langs/lv_LV/agenda.lang
htdocs/langs/lv_LV/banks.lang
htdocs/langs/lv_LV/bills.lang
htdocs/langs/lv_LV/boxes.lang
htdocs/langs/lv_LV/opensurvey.lang
htdocs/langs/lv_LV/users.lang
htdocs/langs/ro_RO/admin.lang
htdocs/langs/ro_RO/banks.lang
htdocs/langs/ro_RO/bills.lang
htdocs/langs/ro_RO/companies.lang
htdocs/langs/ro_RO/compta.lang
htdocs/langs/ro_RO/cron.lang
htdocs/langs/ro_RO/dict.lang
htdocs/langs/ro_RO/help.lang
htdocs/langs/ro_RO/main.lang
htdocs/langs/ro_RO/margins.lang
htdocs/langs/ro_RO/other.lang
htdocs/langs/ro_RO/stocks.lang
htdocs/langs/ro_RO/suppliers.lang
htdocs/langs/ro_RO/withdrawals.lang
htdocs/langs/uz_UZ/main.lang
2013-12-31 12:18:31 +01:00
Laurent Destailleur
e142bd252d
Fix: disable code making jmobile crazy.
2013-12-31 10:48:15 +01:00
Laurent Destailleur
f0151ce112
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-30 12:44:46 +01:00
Laurent Destailleur
cfb791c584
Fix: Better translation
2013-12-29 19:30:11 +01:00
Laurent Destailleur
49f3242796
Merge pull request #1357 from marcosgdf/payment_menu
...
Payment menu
2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-26 19:43:31 +01:00
Marcos García de La Fuente
917ddf0dee
Payments and Supplier payment pages tabs can now be extended from modules.
2013-12-25 03:16:57 +01:00
Laurent Destailleur
fcfe94d4ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191
Fix: Can import contacts not linked to any thirdparties.
2013-12-24 16:11:23 +01:00
Laurent Destailleur
9e5e74cb58
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/fourn/commande/fiche.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/languages.lang
htdocs/langs/es_ES/main.lang
2013-12-19 21:03:15 +01:00
Laurent Destailleur
b35f44e3cb
New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs
...
when you use the "print" view on screen.
2013-12-19 20:57:13 +01:00
Laurent Destailleur
11e0fb8f7a
Fix: Missing ref field into export.
2013-12-17 09:11:36 +01:00
Laurent Destailleur
1dca56c213
Fix: Calculation of number of linked files was not working on taxes.
2013-12-16 23:45:12 +01:00
Laurent Destailleur
ca36a4dd97
Merge pull request #1348 from atm-alexis/3.5
...
Improper use of delete() function and ldap with multientity bug corrections
2013-12-16 05:26:31 -08:00
Alexis Algoud
ba70794c1d
Add multicompany->enabled test
2013-12-16 09:45:38 +01:00
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Laurent Destailleur
3c87e1e20d
Fix: no required class for not mandatory fields
2013-12-15 18:11:56 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
c34e50114a
Start to work on a basic print sticker tool
2013-12-15 03:23:10 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
dc754bbdc2
Fix: Trigger name conflicts and reference file was not matching real
...
name of triggers.
2013-12-14 20:48:34 +01:00
Laurent Destailleur
db10740e2a
Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks
...
Feature/multicompanybookmarks
2013-12-13 18:52:38 -08:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
42f032ded3
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 01:30:15 +01:00
Laurent Destailleur
8d872ab4fb
Uniformize code and more comments
2013-12-14 00:24:43 +01:00
Laurent Destailleur
2f5932026e
More information returned into return code
2013-12-13 18:33:05 +01:00
Laurent Destailleur
9a07f31a8c
Doxygen
...
Bad translation
2013-12-13 17:36:43 +01:00
Alexis Algoud
4844aed67e
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2013-12-11 15:15:30 +01:00
Regis Houssin
0247241277
Fix: wrong path with multicompany module
2013-12-11 12:23:36 +01:00
Laurent Destailleur
286bdf91d4
Better detection of corrupted module files.
2013-12-10 18:52:48 +01:00
Laurent Destailleur
c3c6588426
Better detection of corrupted module files.
2013-12-10 16:25:27 +01:00
Laurent Destailleur
65593bce34
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-12-10 15:51:16 +01:00
Laurent Destailleur
8fb0986303
New: Add path file of trigger into admin trigger list page
2013-12-10 15:49:57 +01:00
Raphaël Doursenaud
071dd8e758
Make bookmarks module multicompany aware
2013-12-10 12:00:42 +01:00
Laurent Destailleur
f804833b9c
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645
Fix: Missing special code into export
2013-12-08 21:24:59 +01:00
Laurent Destailleur
3c0c9019b5
Comment
2013-12-08 15:40:22 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Laurent Destailleur
0e819ab5cd
Fix: Missing test
2013-12-07 16:43:35 +01:00
Laurent Destailleur
598a241366
Fix: minor css.
...
Fix: Alignement of screenshot was wrong. Wrapping too.
2013-12-06 10:23:26 +01:00
Laurent Destailleur
4d9712ea4c
Merge pull request #1318 from csalvador/develop-fichinterPDF
...
Develop fichinter pdf
2013-12-04 09:41:13 -08:00
Laurent Destailleur
24ce511671
Fix: [ bug #1167 ] Supplier IBAN account number set but no account
...
specified warning
2013-12-04 18:20:58 +01:00
Florian Henry
c2a8967b52
Much better fix for translated product description into PDF
2013-12-03 17:06:19 +01:00
