Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
52,830 Commits 36 Branches 189 Tags
30aea901b8f83d4563c864abb841a3e4f7ce9e83
Commit Graph

2111 Commits

Author SHA1 Message Date
Laurent Destailleur
cd58c93de6 FIX If option to hide automatic ECM is on, dont show menu. 2016-01-28 12:51:34 +01:00
phf
83f90e2b1f Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/commande/card.php
 2016-01-25 21:50:43 +01:00
phf
8e933ebb2d Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 2016-01-25 19:31:35 +01:00
Laurent Destailleur
274caf61eb NEW Add statistics for interventions module 2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b NEW Module "Supplier commercial proposal" (price request) is set to 
stable status.
 2016-01-25 12:33:38 +01:00
Laurent Destailleur
ba833dc412 Work on CMS module 2016-01-24 21:35:41 +01:00
Laurent Destailleur
8d46a56dac Work on CMS module 2016-01-24 21:17:11 +01:00
phf
9376699299 FIX travis missing comment for new param 2016-01-23 16:16:15 +01:00
phf
373225272b FIX reorder the display of currency and rate on propal/order 
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
 2016-01-23 16:01:55 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-01-23 11:51:56 +01:00
Laurent Destailleur
a406334643 Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification 
FIX line refetch incompatible with hook practice
 2016-01-22 04:10:06 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
cc71445b45 Fix: Only one name for one same feature. 2016-01-22 02:41:51 +01:00
Laurent Destailleur
e6653ea14f Merge pull request #4333 from defrance/patch-94 
Parameters harmonization of hook call
 2016-01-22 02:35:21 +01:00
Laurent Destailleur
219ce73ea2 Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook 
FIX nblignes not calculated after hook and hook can't modify this val...
 2016-01-22 02:10:36 +01:00
phf
68857499d7 NEW display multicurrency price on azur pdf model 2016-01-21 22:26:51 +01:00
phf
f7afbcff68 NEW integration of multicurrency module (creation fields in database and admin) 
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
 2016-01-21 21:38:52 +01:00
Laurent Destailleur
03461d124a Fix activation of cron jobs by external module 
Clean code for task lists pages.
 2016-01-19 23:45:03 +01:00
Alexis Algoud
48d674578b FIX line is refetch (and seems useless) unless it was modified by the hook previous calling 2016-01-19 11:54:07 +01:00
Laurent Destailleur
6bccac5691 NEW Add Expense report to approve into workboard 
NEW Selection of boxes is move on top
 2016-01-18 11:35:45 +01:00
Laurent Destailleur
be4f9baac6 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-01-16 10:21:52 +01:00
Laurent Destailleur
d46c655fb4 FIX: Sql syntax error in doc_generic_task_odt 2016-01-16 10:20:14 +01:00
arnaud
8b2541ebf9 FIX nblignes not calculated after hook and hook can't modify this value. Usefull for modules 2016-01-14 14:10:50 +01:00
Laurent Destailleur
7b14b5e115 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-14 13:30:27 +01:00
Laurent Destailleur
63ebd40ceb Fix bad var value 2016-01-14 11:22:59 +01:00
Laurent Destailleur
0f5e208127 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-13 20:43:49 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Laurent Destailleur
9ba25be9bb Change category for application 2016-01-13 13:37:24 +01:00
Laurent Destailleur
f74dfe282b Fix missing default setup when module is enabled 2016-01-13 13:36:44 +01:00
Laurent Destailleur
381eea0dbf Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-01-12 23:10:25 +01:00
phf
f280061a90 FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is displayed on pdf 2016-01-12 11:09:47 +01:00
Laurent Destailleur
6684bdce84 Merge pull request #4349 from benlo06/fr_4347 
CLOSE #4347 Add payment label to invoices csv exports
 2016-01-10 11:47:25 +01:00
aspangaro
965a96784c Fix: Donation some problems with french article 2016-01-10 07:35:00 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
56af0761ee Merge pull request #4295 from aspangaro/develop-a8 
Accountancy Add a list to select accounting account on donation admin
 2016-01-09 17:46:02 +01:00
Laurent Destailleur
e5d0bc9d57 Fix permission not used 2016-01-09 00:34:15 +01:00
Benlo
4aef3d29c1 FIX 4347 : Add labels in translations and change order 2016-01-08 15:03:46 +01:00
Benlo
00b77bafbe CLOSE #4347 Add payment label to invoices csv exports 
For CSV export, add the possibility to export the column libelle (name of payment)
 2016-01-07 14:20:54 +01:00
philippe grand
7b7f2e9fed translations 2016-01-07 10:07:05 +01:00
Laurent Destailleur
d6c5a73264 Fix missing payment fields definition in export 2016-01-06 17:37:01 +01:00
BENKE Charlie
428b10d26b Update doc_generic_supplier_proposal_odt.modules.php 2016-01-06 10:55:37 +01:00
BENKE Charlie
cd2e4a5e1e Update doc_generic_proposal_odt.modules.php 2016-01-06 10:53:11 +01:00
BENKE Charlie
cbb5f522eb Update doc_generic_task_odt.modules.php 2016-01-06 10:39:18 +01:00
BENKE Charlie
e6fd718e51 Update doc_generic_project_odt.modules.php 2016-01-06 10:38:06 +01:00
BENKE Charlie
16d43b169c Update doc_generic_invoice_odt.modules.php 2016-01-06 10:36:34 +01:00
BENKE Charlie
743967a9b3 Update doc_generic_shipment_odt.modules.php 2016-01-06 10:35:43 +01:00
BENKE Charlie
ef597395ba Update doc_generic_order_odt.modules.php 2016-01-06 10:34:55 +01:00
BENKE Charlie
5e9b7f07d6 Update doc_generic_odt.modules.php 2016-01-04 15:09:18 +01:00
BENKE Charlie
7d6eb270b8 Update doc_generic_proposal_odt.modules.php 2016-01-04 15:08:44 +01:00