Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

603 Commits

Author SHA1 Message Date
phf
86c8998742 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 20:53:06 +01:00
Laurent Destailleur
d715345c82 Debug 2016-02-15 15:07:57 +01:00
Laurent Destailleur
23afb80c82 Can remove status recurring or not of template invoice 2016-02-15 14:42:05 +01:00
phf
4f6289bea0 Fix test if frequency is defined to create or not by the cron 2016-02-12 16:09:50 +01:00
phf
428a7e7042 FIX remove comment, calcul next date for recurring invoice, increment nb_gen_done 2016-02-12 15:55:55 +01:00
phf
c4812abd62 Fix can update fields of facture rec 
Fix create invoice from facture rec don't get all properties and add fk_account
 2016-02-12 12:31:43 +01:00
phf
875e01aeee New add recurrence fields on create form of invoice model 
Fix missing fields in database about multicurrency
 2016-02-11 09:50:35 +01:00
phf
a0cfe9aad8 New add payment with multicurrency module 2016-02-10 23:16:38 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
Laurent Destailleur
f4d04b8f26 FIX part of #4227 2016-02-03 02:41:07 +01:00
Laurent Destailleur
c28c8d5d18 Add more info into log 2016-02-02 16:32:47 +01:00
fmarcet
acc9879c7c FIX: It doesn't check if there is enough stock to update the lines of orders/invoices 2016-02-01 13:05:14 +01:00
Laurent Destailleur
2d0c823ffe Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:45:06 +01:00
Laurent Destailleur
7b15ac1179 Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:44:09 +01:00
Laurent Destailleur
0e1bb06d01 Fix duplicate set 2016-01-31 20:41:35 +01:00
Laurent Destailleur
6002adb04c Fix bad transaction level due to code of situation invoices 2016-01-31 20:38:11 +01:00
phf
4baff7898d FIX insert FactureLigne 
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
 2016-01-26 22:18:31 +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
03461d124a Fix activation of cron jobs by external module 
Clean code for task lists pages.
 2016-01-19 23:45:03 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
phf
a50a7366cb FIX travis test 2016-01-13 14:04:48 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Laurent Destailleur
6f474c403c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php
 2015-12-27 19:15:20 +01:00
Marcos García de La Fuente
de1625b9de FIX #4285 SQL query shown when accessing an unexisting invoice 2015-12-24 14:46:01 +01:00
Laurent Destailleur
fec5f4e20b Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:40:32 +01:00
Laurent Destailleur
0a515ca8c0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:38:23 +01:00
Laurent Destailleur
932c3f9172 Fix init of situation_percent 2015-12-21 12:37:58 +01:00
Laurent Destailleur
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
Laurent Destailleur
574b270da0 Work on the "mass action" feature. Can run mass action on 
result of a select.
 2015-12-02 22:00:39 +01:00
Maxime Kohlhaas
da51a28766 Fix : situation percent should be 100 by default 2015-11-23 17:22:29 +01:00
Frédéric FRANCE
3d05b53a62 Typo 2015-11-22 19:08:38 +01:00
Laurent Destailleur
401b2a7389 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/theme/md/style.css.php
 2015-11-20 23:47:07 +01:00
Laurent Destailleur
fbd1d2360f Comment 2015-11-18 13:42:38 +01:00
Laurent Destailleur
388748055a Fix missing translation for VAT 2015-11-15 15:08:54 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to 
suggest different vat lines with same value with ability to
differentiate them.
 2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Florian HENRY
019575d9ed FIX : better fix for #3805 2015-11-12 13:21:35 +01:00
Laurent Destailleur
3906cb79c5 NEW: Add parameter to add a link to use "date of invoice" in one click 
when fille a payment card.
 2015-11-07 23:46:07 +01:00
Sergio Sanchis Climent
6b01db5960 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2015-11-06 02:08:55 +01:00
Sergio Sanchis Climent
de8e7107ee Maintain origin_id and origin for copy document 
Fix any errors.
 2015-11-06 01:53:20 +01:00
Laurent Destailleur
04664c203d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
 2015-11-05 22:13:08 +01:00
Laurent Destailleur
58cac2d895 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
 2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/product/stock/fiche.php
	htdocs/product/stock/valo.php
 2015-11-05 22:04:18 +01:00
Christophe Battarel
80d2445540 FIX: bad stock valorisation 2015-11-05 17:00:22 +01:00
Raphaël Doursenaud
c534f5bcd5 Fix #3805 Enhanced Facture::is_last_in_cycle() 2015-11-04 20:35:20 +01:00
Laurent Destailleur
a7795f25fc Fix Must make a difference between a buying/cost price == '' (not 
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
 2015-11-04 17:51:15 +01:00
fappels
4d839eea60 Fix #2591 Margin is incorrect used with POS 
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
 2015-10-26 20:33:42 +01:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
 2015-10-10 18:56:28 +02:00