Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 15:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,188 Commits 36 Branches 190 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

6654 Commits

Author SHA1 Message Date
Laurent Destailleur
1bbecc0912 Restore link to stock for products. 2015-04-08 19:26:36 +02:00
Laurent Destailleur
17fa1ce5b6 Fix #2552 2015-04-08 12:22:52 +02:00
Laurent Destailleur
c25af905a3 Merge pull request #2557 from frederic34/adherent 
Add public note to members
 2015-04-06 21:23:40 +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
frederic34
19b55cb4c1 Add public note to members 2015-04-06 18:58:36 +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
e6c9e07de4 NEW Backup and restore tool is easier to use 2015-04-03 17:17:02 +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
4241244345 Fix: class not defined 2015-04-02 17:35:07 +02:00
Laurent Destailleur
f3ad345930 Add loan lang file 2015-04-02 16:59:20 +02:00
Laurent Destailleur
805c73b849 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/en_GB/main.lang
	htdocs/langs/es_CO/salaries.lang
 2015-04-02 14:04:04 +02:00
Laurent Destailleur
acbeb2b360 Fix en_GB 2015-04-02 14:03:52 +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
8d892e19c1 Sync from transifex 2015-04-02 13:56:32 +02:00
Laurent Destailleur
0f51314c7e Sync from transifex 2015-04-02 13:28:20 +02:00
Laurent Destailleur
50d77d7e6f Correct source lang 2015-04-02 12:55:44 +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
2bdca3d76b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-31 11:33:10 +02:00
Laurent Destailleur
2d50cc92b9 Differentiate title for customer and supplier orders/invoices. 2015-03-31 11:32:47 +02:00
Laurent Destailleur
9d752c6fca Sync from transifex 2015-03-30 10:55:08 +02:00
Laurent Destailleur
b83e9ea32f Merge branch 'loan' of https://github.com/frederic34/dolibarr into 
frederic34-loan

Conflicts:
	htdocs/compta/bank/ligne.php
 2015-03-30 02:56:26 +02:00
frederic34
b6b1617741 Work on payment loan 2015-03-29 17:53:36 +02:00
Laurent Destailleur
018a0d779f Fix translation 2015-03-29 15:18:10 +02:00
aspangaro
a92f68a5ed Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-29 09:25:06 +02:00
aspangaro
ce6df7c022 Debug 2015-03-29 09:20:32 +02:00
frederic34
be1595a187 Add tab for notes 2015-03-28 17:42:33 +01:00
frederic34
af92174ae2 Small correction but unable to make loan payment 2015-03-28 17:15:07 +01:00
frederic34
7282a6faf2 Trans in Loan Calculator 2015-03-28 10:59:10 +01:00
frederic34
680317f250 Trans in Loan Calculator 2015-03-28 10:02:33 +01:00
aspangaro
77b123cb2d Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-27 06:30:35 +01:00
Laurent Destailleur
60c24f7162 Merge pull request #2478 from frederic34/listexpe 
Add last shipments to company card
 2015-03-27 01:04:05 +01:00
aspangaro
f0823a215b Add language key 2015-03-26 21:16:52 +01:00
aspangaro
4209deafd2 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-26 21:04:20 +01:00
aspangaro
059bb40345 Debug 2015-03-26 20:43:34 +01:00
Laurent Destailleur
1ca95acbd7 Fix pb during export of agenda events 
Conflicts:
	htdocs/exports/export.php
 2015-03-26 11:23:21 +01:00
Laurent Destailleur
ce8bd7a515 Fix pb during export of agenda events 2015-03-26 11:20:39 +01:00
aspangaro
679391d337 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 2015-03-25 20:59:48 +01:00
Laurent Destailleur
ab739e162c Merge remote-tracking branch 'origin/3.7' into develop 2015-03-25 18:11:29 +01:00
frederic34
19540b14b5 Add last shipments to company card 2015-03-25 16:38:18 +01:00
Laurent Destailleur
a32fc9efce Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set. 
Avoid logo to overwrap box with css.
Add help text.
 2015-03-24 14:08:56 +01:00
Laurent Destailleur
f75c115140 Fix translation 
Fix permission not managed into get_menudiv.php
 2015-03-24 11:19:51 +01:00
aspangaro
9d34b40897 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/compta/bank/account.php
 2015-03-24 05:28:57 +01:00
aspangaro
be0ab4c9b4 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-23 06:58:25 +01:00
aspangaro
c4d852ffd7 Correct from frederic34 2015-03-22 20:57:41 +01:00
aspangaro
414d4c6432 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-22 18:08:12 +01:00
Laurent Destailleur
55140afde4 Merge branch 'price-global-variables' of 
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/dynamic_price/editor.php
 2015-03-22 12:45:04 +01:00
aspangaro
0e01dbd44e Update work 2015-03-20 06:36:48 +01:00
Laurent Destailleur
f44d91e153 NEW: The notification module accept keyword __SUPERVISOR__ to send 
notification to supervisor of user.
 2015-03-19 11:47:30 +01:00