lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,044 Commits 43 Branches 150 Tags 886 MiB
3.6.0-alpha
Commit Graph

811 Commits

Author SHA1 Message Date
Florian Henry
f93df7f3da remove debug string 2014-03-26 10:09:29 +01:00
aspangaro
58796b85c8 Try to correct travis 2014-03-18 06:53:45 +01:00
aspangaro
a7c97cc71a Add title in list of supplier payments 2014-03-17 21:51:31 +01:00
Juanjo Menent
53bb32318a Fix: Bad action set for invoice 2014-03-17 17:27:47 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error 
Corrected Unknown error message typo
 2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Laurent Destailleur
b64a2b2718 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-28 21:43:29 +01:00
Laurent Destailleur
74404749c6 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 2014-02-28 16:00:57 +01:00
Marcos García de La Fuente
607effdc7a Replacing invoice integer types with FactureFournisseur constants 2014-02-26 01:09:34 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
Laurent Destailleur
d7c9ebd5ee Fix: sort on supplier ref. 2014-02-19 03:04:56 +01:00
Laurent Destailleur
03a60236af Fix: sort on supplier ref. 2014-02-19 03:03:26 +01:00
geoffrey.girard
efa7a16c07 Add hook printObjectLine supplier order and supplier invoice 2014-02-04 17:30:48 +01:00
Laurent Destailleur
efcff80a28 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/control
	htdocs/fourn/facture/paiement.php
 2014-02-03 18:44:48 +01:00
Laurent Destailleur
e5cd32623c Qual: Uniformize code of payment between customer and supplier payments. 
New: Add warning if supplier payment is higher that due amount.
 2014-02-03 18:42:24 +01:00
Laurent Destailleur
2b2d764180 Fix: ref and date of supplier invoice. 
Fix: Check on bank account
 2014-02-03 17:30:35 +01:00
Laurent Destailleur
2d15e2c759 Fix: Link on supplier in document invoice must go to supplier card. 2014-02-01 16:31:23 +01:00
Laurent Destailleur
7de0438299 Fix: Link on supplier in document invoice must go to supplier card. 2014-02-01 16:26:41 +01:00
Laurent Destailleur
7986c95ce3 Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:26:42 +01:00
Laurent Destailleur
372acbfb0d Fix: Error management when deleting a payment on supplier invoice. 2014-01-25 00:25:42 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Grand Philippe
462f65614d Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:10:17 +01:00
Laurent Destailleur
5f65b2a97f Merge remote-tracking branch 'origin/3.5' into develop 2014-01-12 20:23:24 +01:00
Laurent Destailleur
ffeb2778e5 Fix: path to image must not be hardcoded but use dol_buildpath or 
img_picto with param src=1.
 2014-01-12 19:23:36 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Laurent Destailleur
2c310e26a6 Fix: Missing lang file 2014-01-10 01:37:41 +01:00
Laurent Destailleur
22412443fe Fix: Overwrite bad value of limit payment date only if payment date is 
defined.
 2013-12-25 18:12:13 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Laurent Destailleur
71484a4e1e Fix: Missing hook declaration 2013-11-20 14:29:50 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Florian Henry
870b78fc19 [ bug #1142 ] Set paiement on invoice 2013-11-19 10:41:00 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
Laurent Destailleur
b2308ba65c Merge pull request #1284 from GPCsolutions/links 
Links
 2013-11-06 17:15:49 -08:00
Laurent Destailleur
4c4064d7b9 Enable option to swith vat calculation mode 2013-11-06 17:45:55 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1 factorization 2013-11-06 10:20:54 +01:00
Cédric Salvador
c96b2d3b87 factorized form attach, documents list and links list for the document pages 2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Laurent Destailleur
70342c09b8 Fix: Better management of using ajax for upload form (to solve problem 
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename
 2013-10-29 17:52:13 +01:00
Laurent Destailleur
8526d34d3b Fix: Calculation of second rounding method is available for supplier 
invoices.
 2013-09-18 16:46:54 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
b20b82df3d Fix: we must use conf-currency as parameter of method price instead of 
using langs->getCurrencySymbol
 2013-09-15 13:04:38 +02:00
Laurent Destailleur
f2bdd8c1d8 Work on alternative vat calculation mode 2013-09-13 17:43:26 +02:00
Laurent Destailleur
e467d63a94 Try to fix false positive 2013-09-10 15:45:36 +02:00
Laurent Destailleur
74a50d8d6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-07 19:51:00 +02:00
Laurent Destailleur
bd24711b30 Fix: navigation of supplier invoices 2013-09-07 19:50:47 +02:00