Commit Graph

4817 Commits

Author SHA1 Message Date
Laurent Destailleur
8e7b310fb6 Fix: [ bug #1400 ] Silent Warning create a draft invoice 2014-05-25 05:01:14 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
2014-05-21 20:30:07 +02:00
Regis Houssin
b39627288e Fix: missing hookmanager global 2014-05-21 11:48:45 +02:00
Raphaël Doursenaud
c3f05d1c1c Withdrawals: fixed bad translation key 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
3209483f1b Bank search: Better wording 2014-05-19 14:38:26 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
2014-05-18 11:52:52 +02:00
Laurent Destailleur
d7d8eba6b1 Merge pull request #1592 from atm-alexis/3.5_adding_page_to_list_product_as_other_list
Fix page numerotation for product, invoice and others as in company list
2014-05-14 11:26:22 +02:00
Laurent Destailleur
f621f7eb32 Fix: The rounding mode is now forced when provided explicitly and no
more by default (we keep data intact when no mode provided).
2014-05-13 13:22:29 +02:00
Laurent Destailleur
69eaefc459 Fix: The way we tested if a ref/id already exists was wrong. Introduce a
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
2014-05-13 10:12:45 +02:00
Laurent Destailleur
bd061f4245 Fix: [ bug #1380 ] Customer invoices are not grouped in company results
report
2014-05-13 01:29:01 +02:00
Laurent Destailleur
18848eaf74 Clean forms 2014-05-12 13:25:36 +02:00
Laurent Destailleur
3393b1c5fb Fix: Date of invoice is set to current date when cloning. // TODO Best
is to ask date into confirm box.
2014-05-12 12:15:54 +02:00
Laurent Destailleur
64f8dcf131 Fix: Bad syntax of vars 2014-05-12 12:10:52 +02:00
Alexis Algoud
f13c146908 Fix page numerotation as in company list 2014-05-12 11:00:58 +02:00
aspangaro
4025fda62a Merge branch 'upstream/develop' 2014-05-11 20:53:15 +02:00
Laurent Destailleur
bafc53ad95 Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error 2014-05-11 19:05:51 +02:00
Laurent Destailleur
76330ad04a Fix: [ bug #1383 ] When add a salary payment - In bank, link "user"
doesn't work
2014-05-11 18:35:25 +02:00
aspangaro
bb5d800524 Print instead of echo 2014-05-11 06:49:11 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
work but it does not enable it
2014-05-10 18:57:04 +02:00
Laurent Destailleur
f36b9effe8 Fix: [ bug #1373 ] Required type of payment input is not visible 2014-05-10 17:22:12 +02:00
Laurent Destailleur
3fd7e18c08 Fix: Bad translation into title of action buttons 2014-05-10 17:00:55 +02:00
Laurent Destailleur
9f795331f5 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/charges.php
	htdocs/core/db/mysql.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
5a6ad1ef5f Fix: [ bug #1362 ] Note is not saved
Fix: tr/td balance.
2014-05-06 23:19:48 +02:00
Laurent Destailleur
5e12459ad1 Fix: Ref and date for social contributions payments were merged into on
field making not possible to click on ref.
2014-05-06 22:54:33 +02:00
Laurent Destailleur
131f133e07 New: Merge free product and predefined product area to enter new
product (Supplier orders now use same template than customer
orders/proposal/invoices).
2014-05-05 17:59:43 +02:00
Laurent Destailleur
d224128c46 New: Merge free product and predefined product area to enter new
product.
2014-05-05 14:30:08 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval
Qual: Remove the closing PHP tag
2014-05-04 18:08:37 +02:00
Laurent Destailleur
bc35728ea3 Merge pull request #1562 from marcosgdf/translation
Improved translations
2014-05-04 17:39:36 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
12aa541db4 Clean code 2014-05-02 17:58:26 +02:00
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script.
Fix: strict mode.
2014-05-01 19:17:45 +02:00
Marcos García de La Fuente
5d46115dd3 Missing translation of transaction types in releve detail 2014-05-01 16:32:04 +02:00
Laurent Destailleur
6a200105b9 Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop

Conflicts:
	ChangeLog
2014-05-01 11:16:42 +02:00
Laurent Destailleur
3719fc1234 Merge pull request #1557 from defrance69/develop
export extrafields on bill & set real ref bordereau number
2014-05-01 11:09:16 +02:00
aspangaro
270e58637f Salaries payments :: Add sortfield & search 2014-05-01 08:58:19 +02:00
aspangaro
ca0b6c26df Translation 2014-05-01 08:19:55 +02:00
aspangaro
3b265c8d53 TVA :: Add sortfield & search 2014-05-01 07:44:10 +02:00
aspangaro
c6e2afb11e Social contrib. :: Replace index.php by $_SERVER["PHP_SELF"] 2014-05-01 05:57:27 +02:00
Laurent Destailleur
880f77b7e1 Fix: Preview feature 2014-04-30 13:50:25 +02:00
aspangaro
4caedaf3e5 Salaries : typo & presentation 2014-04-30 06:38:36 +02:00
aspangaro
eb926103e0 TVA : Add type_payment & num_payment who are missing 2014-04-30 06:37:47 +02:00
aspangaro
11b0bc4b38 Merge branch 'upstream/develop' 2014-04-30 04:58:07 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
aspangaro
06b386443d Merge branch 'upstream/develop' 2014-04-29 06:37:39 +02:00
Laurent Destailleur
4cb671f4db Qual: Clean deprecated code. 2014-04-28 11:55:08 +02:00
aspangaro
bab54f8264 Type bank & tva 2014-04-28 06:41:27 +02:00
aspangaro
73eec6b872 Fix :: Key language "Thirdparty" not traduced when module thirdparty is deactivated 2014-04-28 04:53:39 +02:00
aspangaro
9ff3dc6189 Fix :: MySql Problem when create a salary payment 2014-04-28 04:43:17 +02:00
aspangaro
e03be4f6ed HRM Area - Typo & presentation 2014-04-27 04:08:34 +02:00