Commit Graph

9302 Commits

Author SHA1 Message Date
Laurent Destailleur
f9c8b2e1cf Merge pull request #2560 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2015-04-07 23:56:40 +02:00
Juanjo Menent
1f4a131691 Fix: Bad permission assignments for stock movements actions
Conflicts:
	htdocs/product/stock/product.php
2015-04-07 20:43:27 +02:00
Juanjo Menent
d7ba9b3312 Fix: Bad permission assignments for stock movements actions
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/stock/mouvement.php
2015-04-07 20:40:48 +02:00
Juanjo Menent
9d8cb459f1 Fix: Bad permission assignments for stock movements actions 2015-04-07 20:28:45 +02:00
Frédéric FRANCE
0dc7bc0ddb Add badge 2015-04-07 12:54:10 +02:00
Laurent Destailleur
6fa0234409 Uniformize code 2015-04-07 03:00:11 +02:00
Laurent Destailleur
ad50810c7a Fix deprecated code 2015-04-07 02:48:19 +02:00
Scrutinizer Auto-Fixer
918ed34364 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-07 00:45:30 +00:00
Frédéric FRANCE
85d8d06ca4 Travis fix CMailFile.class.php 2015-04-06 20:02:29 +02:00
Laurent Destailleur
493392d89f Remove warnings 2015-04-06 19:46:10 +02:00
Laurent Destailleur
c148f82452 Fix warning 2015-04-06 19:31:25 +02:00
Laurent Destailleur
02e8879d3b NEW Feature to build a merged pdf with all unpaid invoice can work for
paid invoices.
2015-04-06 19:11:31 +02:00
Laurent Destailleur
3d161deb17 Fix more robust function 2015-04-06 16:50:26 +02:00
Laurent Destailleur
b49705d5d0 Status and amount of object should always be visible. 2015-04-06 16:13:23 +02:00
Laurent Destailleur
0155d75f27 Merge pull request #2554 from aspangaro/develop-adherent
Module member: move field note to note_private & typo
2015-04-06 12:58:52 +02:00
Laurent Destailleur
e2508287bd Merge pull request #2537 from marcosgdf/cq
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-06 12:37:52 +02:00
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-06 10:25:30 +00:00
Laurent Destailleur
828dc2c9f4 Fix code standard 2015-04-06 12:22:52 +02:00
Laurent Destailleur
a5c74a7d95 Clean code 2015-04-06 11:59:58 +02:00
Laurent Destailleur
8fb14b122a Fix phpcs 2015-04-06 11:28:06 +02:00
aspangaro
03b1db138e Debug 2015-04-06 08:20:23 +02:00
Laurent Destailleur
5fa21f37f0 Fix trim label 2015-04-05 17:13:24 +02:00
Laurent Destailleur
2ec5595277 NEW Can install an external module from admin pages, if web server has
permission for and if setup is ok for.
2015-04-04 00:19:03 +02:00
Laurent Destailleur
106a393054 NEW Add function dolCopyDir to copy directory with recursive content. 2015-04-03 23:42:56 +02:00
Laurent Destailleur
afecab3f39 Better error management for dol_uncompress 2015-04-03 18:42:07 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Laurent Destailleur
b01369a32e Error management 2015-04-03 15:25:24 +02:00
Marcos García de La Fuente
6fe803cd86 Created Propal, FactureFourniseur, and Commande constants for status 2015-04-03 05:18:47 +02:00
Laurent Destailleur
69eaa032bf Merge remote-tracking branch 'origin/3.7' into develop 2015-04-03 01:10:55 +02:00
Laurent Destailleur
98b1d6170d Fix style fieldrequired must be used only in create/edit mode. 2015-04-03 01:07:17 +02:00
Frédéric FRANCE
5a17a51212 Update box_actions.php 2015-04-02 18:11:30 +02:00
Laurent Destailleur
4241244345 Fix: class not defined 2015-04-02 17:35:07 +02:00
Laurent Destailleur
c90a86e4a4 Fix filters for exports 2015-04-02 16:58:36 +02:00
Laurent Destailleur
761409caf6 Fix sql error 2015-04-02 15:17:07 +02:00
Laurent Destailleur
cf0f458a51 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/en_GB/bills.lang
	htdocs/langs/en_GB/main.lang
	htdocs/langs/en_GB/orders.lang
	htdocs/langs/es_AR/bills.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/main.lang
	htdocs/langs/es_ES/bills.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/fa_IR/categories.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/other.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/nb_NO/bills.lang
	htdocs/langs/pl_PL/bills.lang
	htdocs/langs/pl_PL/mails.lang
	htdocs/langs/pl_PL/projects.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/products.lang
	htdocs/langs/ro_RO/projects.lang
	htdocs/langs/ru_RU/bills.lang
	htdocs/langs/ru_RU/projects.lang
	htdocs/langs/sl_SI/main.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/projects.lang
	htdocs/langs/vi_VN/bills.lang
2015-04-02 13:57:20 +02:00
Laurent Destailleur
d8bec2fb59 Merge pull request #2507 from frederic34/doc4contact
Add document tab for contact
2015-04-02 11:41:35 +02:00
Laurent Destailleur
051f3474c4 Merge pull request #2512 from frederic34/patch-9
Add badge
2015-04-02 11:25:06 +02:00
Laurent Destailleur
0187a9a4ee Merge pull request #2511 from fappels/3.7
FIX: dispatch batch products
2015-04-02 11:24:01 +02:00
Laurent Destailleur
bff4b0e52e Merge pull request #2506 from frederic34/patch-8
Add ORDER_CANCEL in interface_90_all_Demo.class.php
2015-04-02 11:22:38 +02:00
Laurent Destailleur
d8db32a99c NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
2015-04-01 21:00:51 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Laurent Destailleur
16a620f926 Fix: Deadlock situation (when order were canceled, no way to make
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
2015-04-01 16:07:22 +02:00
Laurent Destailleur
ad1e4134a9 Fix: bcc was lost if notif to bcc was also forced 2015-04-01 12:22:50 +02:00
Laurent Destailleur
1bc0f6c99f Fix: do not show end date when it is same than start date 2015-04-01 12:02:32 +02:00
Laurent Destailleur
293495467f Fix: Bad ref used into notification message 2015-04-01 11:30:48 +02:00
Laurent Destailleur
c71efc8f2e Avoid pb with scrutinizer 2015-03-31 16:59:40 +02:00
Frédéric FRANCE
2a34ec9db1 Add badge 2015-03-31 16:26:32 +02:00
Francis Appels
bba8b206a1 FIX: dispatch batch products
Fix dispatching batch products and add error message.
Make DispatchProduct method backwards comp and add missing $trigger.
Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.
2015-03-31 15:48:08 +02:00
frederic34
fe6227e93f Typo 2015-03-31 08:45:36 +02:00
frederic34
bab04258e0 Add document tab for contact 2015-03-30 18:15:29 +02:00