Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

8505 Commits

Author SHA1 Message Date
Laurent Destailleur
b5c9602da4 Fix Use new look for left-right arrow 2015-11-08 00:08:50 +01:00
Laurent Destailleur
031b33d582 FIX Checkbox reconciliated no correctly checked with some Chrome 
versions
 2015-11-07 23:54:11 +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
Marcos García de La Fuente
01854b3259 FIX #3679 Error when deleting a Localtax2 special payment 2015-11-07 13:51:09 +01:00
Marcos García de La Fuente
728f469c1e FIX #3890 Expected transactions bank account page, shows negative numbers 2015-11-07 13:43:59 +01:00
Marcos García de La Fuente
b4c3804c91 FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card 2015-11-07 13:21:03 +01:00
Christophe Battarel
f52ae35dc6 NEW FEATURE PROPOSAL: on propale, order or invoice creation from 
scratch, reload page after customer selection so its informations can be
loaded
 2015-11-06 16:14:00 +01:00
Florian HENRY
121d2beb80 fix spacing 2015-11-06 10:34:18 +01:00
Florian HENRY
f220f584ce Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-06 10:31:03 +01:00
Florian HENRY
126b5d6eca FIX : only active customer should be available into select list 
thirdparty on invoice creation
 2015-11-06 10:19:10 +01:00
Florian HENRY
600dbced7e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-06 09:49:48 +01:00
Florian HENRY
8d829dca32 FIX : only active customer should be return into new invoice creation 
select list
 2015-11-06 09:49:02 +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
fmarcet
015dedc3ab FIX: Show category selector if we have permission to view products or 
services
 2015-11-05 11:53:45 +01:00
Laurent Destailleur
1f4481a6b0 Merge pull request #3172 from atm-maxime/new_creditnote 
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
 2015-11-05 02:45:15 +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
Laurent Destailleur
563a020595 NEW Free text for cheque deposit receipt can be HTML content. 2015-11-02 20:35:33 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
3ba97627ff FIX Default thirdparty when cloning invoice was not set. 2015-11-02 15:50:03 +01:00
Laurent Destailleur
200e4638f4 Merge pull request #3812 from fappels/develop-best-pmp-pos-margin 
Fix: #2591 Margin is incorrect used with POS
 2015-11-02 11:06:20 +01:00
aspangaro
d8f77f58d7 Salaries : Replace "label for" by the function fieldLabel & add some notes 2015-11-02 06:42:17 +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
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
Laurent Destailleur
080ba15e0d FIX The price per level just never correctly manage the vat. Vat is not 
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
 2015-10-25 22:50:05 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
 2015-10-25 19:54:41 +01:00
Laurent Destailleur
461771d488 Currency is on title only. 2015-10-24 21:20:32 +02:00
Laurent Destailleur
cac4a85ccd Merge pull request #3788 from atm-maxime/new_customer_recap 
New customer recap
 2015-10-22 18:02:38 +02:00
Maxime Kohlhaas
ef2337a338 Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8 
Conflicts:
	htdocs/compta/facture/list.php
 2015-10-22 14:41:58 +02:00
Frédéric FRANCE
5237a2afc7 Fix lost searchstatus on next page list 2015-10-20 17:45:24 +02:00
Laurent Destailleur
22979523db Try a fix for #3742 2015-10-20 02:34:53 +02:00
Maxime Kohlhaas
4de7874118 New : review customer account summary and balance 2015-10-19 20:36:25 +02:00
Maxime Kohlhaas
d79fb71987 FIX : search_status not used in mergefusiontool 2015-10-19 16:17:47 +02:00
Maxime Kohlhaas
5fb6705b5c FIX : Search status not saved into list 2015-10-19 15:53:13 +02:00
Maxime Kohlhaas
9e9f32e3bf FIX : project was not retrieved on invoice creation form 2015-10-19 15:38:28 +02:00
Laurent Destailleur
81580f75b9 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture.php
 2015-10-18 21:22:42 +02:00
Laurent Destailleur
bf6b48f5a0 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-18 21:17:29 +02:00
Laurent Destailleur
afe4057a97 FIX #3757 Can't set amount in a social contribution with some languages 2015-10-18 21:17:19 +02:00
Laurent Destailleur
be8e7515a1 Merge pull request #3762 from simnandez/3.8 
Fix: Last page total is 0
 2015-10-18 20:27:17 +02:00
Laurent Destailleur
420bfd8301 FIX Preview pages was not using correct style for ref 2015-10-18 19:09:35 +02:00
Laurent Destailleur
c51bc09e39 FIX The preview of PDF was never refreshed if PDF document was changed 2015-10-18 18:54:54 +02:00
Juanjo Menent
334c14d088 Fix: Last page total is 0 2015-10-18 11:56:42 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Laurent Destailleur
3ce147ccc1 Use new architecture for quick search for the account area. 2015-10-17 02:41:09 +02:00
Laurent Destailleur
8c66a7d099 Revert a bad PR. if form_confirm is replaced with formconfirm, we must 
include a print before. It is no more included into function.
 2015-10-17 02:01:13 +02:00