lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,078 Commits 43 Branches 150 Tags 886 MiB
b8b56e2d26
Commit Graph

2033 Commits

Author SHA1 Message Date
Juanjo Menent
53bb32318a Fix: Bad action set for invoice 2014-03-17 17:27:47 +01:00
Gauthier
eb43bc4982 Correction when adding line with price as '0' 2014-03-17 15:38:12 +01:00
Laurent Destailleur
b1498c584d Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into 
KreizIT-dluo_step5

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-16 20:49:56 +01:00
KreizIT
9be2bb0e60 Travis Fix 2014-03-16 07:00:27 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
KreizIT
3782742aad - add batch management on supplier dispatch product 
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
 2014-03-15 10:28:01 +01:00
Maxime Kohlhaas
67342486a6 Task 1074 : add link to source document on stock movement 2014-03-15 02:18:39 +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
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
325b9c9688 Qual: Removed dead code 2014-03-01 14:54:11 +01:00
Laurent Destailleur
ea773531b5 Fix: [ bug #1206 ] PMP price is bad calculated 2014-03-01 14:49:30 +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
Laurent Destailleur
867c83680b Merge remote-tracking branch 'origin/3.5' into develop 2014-02-17 18:22:49 +01:00
Laurent Destailleur
1cfcda702e Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not 
work.
 2014-02-17 17:32:25 +01:00
Laurent Destailleur
f743cbafa2 Fix: doxygen 2014-02-10 01:43:35 +01:00
geoffrey.girard
c7f8699973 correction : delete trigger must be called before the delete of object 2014-02-05 09:19:14 +01:00
geoffrey.girard
676101b02f Add trigger on deleteline for supplier order and move trigger on deleteline for supplier invoice after delete sql query 2014-02-04 17:35:27 +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
0d0fda8fae Merge pull request #1382 from atm-geoffrey/develop 
Add new doActions and formObjectOptions hook on supplier prices page
 2014-01-27 01:43:08 -08: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
geoffrey.girard
7f59def98b Correction trigger on update product buyprice 2014-01-22 10:44:23 +01:00
BENKE Charles
0d80d9331f Update fournisseur.class.php 
wrong object
 2014-01-19 15:44:58 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
geoffrey.girard
8729790016 Add trigger on update product buyprice 2014-01-17 10:38:18 +01:00
Laurent Destailleur
af4d48aec0 Fix: If end date is not defined, we can't say it is too late. 2014-01-15 15:42:14 +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
philippe
d2d84c3e48 Fix: path to image must not be hardcoded but use dol_buildpath or 
img_picto with param src=1.
 2014-01-12 21:26:44 +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
49f3242796 Merge pull request #1357 from marcosgdf/payment_menu 
Payment menu
 2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-26 19:43:31 +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
Marcos García de La Fuente
917ddf0dee Payments and Supplier payment pages tabs can now be extended from modules. 2013-12-25 03:16:57 +01:00
Laurent Destailleur
9e5e74cb58 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/fourn/commande/fiche.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/languages.lang
	htdocs/langs/es_ES/main.lang
 2013-12-19 21:03:15 +01:00
Geoffrey
1942b4a476 add extrafields support in supplier orders. managed in configuration but not in view mode 2013-12-17 16:15:48 +01:00
Geoffrey
dce354adc3 add extrafields support in supplier orders. managed in configuration but not in view mode 2013-12-16 11:13:39 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Laurent Destailleur
ed40e6d9b0 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/langs/en_US/bills.lang
 2013-12-14 15:44:10 +01:00
Laurent Destailleur
6cc20cb731 Fix: Filter on third parties were wrong for external users. 2013-12-14 15:21:15 +01:00
Laurent Destailleur
a05d9b864a Fix: Test must never be done on a translated string 2013-12-08 16:40:45 +01:00
Laurent Destailleur
37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/ecm/tpl/builddatabase.tpl.php
	htdocs/fourn/commande/liste.php
	htdocs/product/admin/product_tools.php
 2013-12-08 00:42:36 +01:00
Laurent Destailleur
395066519b Fix: [ bug #1163 ] SQL Error when searching for supplier orders 2013-12-01 16:18:18 +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
c324f6a9a3 Merge pull request #1295 from FHenry/develop 
Display customer code (according setting) into list
 2013-11-15 05:05:36 -08:00
Laurent Destailleur
8b60c79033 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-14 17:17:19 +01:00
Laurent Destailleur
b911d30684 Fix: Stock into subproduct was wrong 
New: Show best sell price and total for virtual products
 2013-11-14 17:16:17 +01:00
simnandez
b9c8852471 Qual: Improve suppliers orders manual receivings 2013-11-14 17:08:59 +01:00
Christophe Battarel
7dbe2bcf2c fix wrong buy price update 2013-11-13 18:41:31 +01:00
Florian Henry
0065adc298 Wrong call of show_contact into fourn/fiche.php 2013-11-13 16:37:17 +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
Laurent Destailleur
c4a43890c4 Merge pull request #1282 from grandoc/develop 
fix : language
 2013-11-05 10:50:14 -08:00
Laurent Destailleur
2d7181553b Fix: translation 2013-11-05 15:29:58 +01:00
Grand Philippe
a14de0c035 fix : language 2013-11-05 15:29:33 +01:00
Grand Philippe
c5f29e14a4 missing trad and fix language 2013-11-02 17:50:24 +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
a8f784083c Show ref with label on bank account. 2013-10-16 19:00:00 +02:00
Laurent Destailleur
94c376bf37 Fix: Edit payment date 2013-10-16 17:55:15 +02:00
Laurent Destailleur
91c6d47a60 Fix: Clean param 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2013-10-08 00:06:14 +02:00
Laurent Destailleur
51a82a2418 Fix: Clean param 2013-10-08 00:04:09 +02:00
Laurent Destailleur
141258f514 Merge remote-tracking branch 'origin/3.4' into develop 
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
	htdocs/fourn/product/liste.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-10-07 16:17:51 +02:00
Christophe Battarel
b7fe0cec34 fix bug on filter and sort 2013-09-26 19:05:56 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone 
everywhere
 2013-09-25 19:58:22 +02:00
Laurent Destailleur
3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-19 01:02:53 +02:00
Laurent Destailleur
8526d34d3b Fix: Calculation of second rounding method is available for supplier 
invoices.
 2013-09-18 16:46:54 +02:00
Laurent Destailleur
d3efd86e3d Fix: Syntax error 2013-09-18 00:33:49 +02:00
Laurent Destailleur
e47165fa38 Merge pull request #1239 from csalvador/replenishment-fix 
Replenishment fix
 2013-09-16 10:39:35 -07:00
Cédric Salvador
967c20e3e9 Improved error message 2013-09-16 14:51:22 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
b0e03462d3 fixed empty being used on a function 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
c1b6e05cc0 Fix: bad sql syntax 2013-09-15 12:46:54 +02:00
Laurent Destailleur
5e969536c0 Fix: bad sql syntax 2013-09-15 12:34:22 +02:00
Christophe Battarel
d9d90f1088 Fix: Supplier price displayed on document lines didnt take discount 
Conflicts:
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-15 12:04:46 +02:00
Christophe Battarel
6959ccf627 Fix: Supplier price displayed on document lines didnt take discount 2013-09-15 11:41:41 +02:00
Laurent Destailleur
f2bdd8c1d8 Work on alternative vat calculation mode 2013-09-13 17:43:26 +02:00
simnandez
b36dc08e00 Remove unnecessary code 2013-09-12 09:59:23 +02:00
simnandez
eb44f272e3 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-11 17:10:06 +02:00
simnandez
a0ce8974b5 [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-11 16:44:34 +02:00
Laurent Destailleur
e467d63a94 Try to fix false positive 2013-09-10 15:45:36 +02:00
Laurent Destailleur
1b526b7aa5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/facture/index.php
 2013-09-09 20:00:12 +02:00
Laurent Destailleur
89619cad7b Fix: Unit test regression 2013-09-08 23:38:40 +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
Laurent Destailleur
1c62d2a475 Fix: Ref not visible into page 2013-09-07 19:11:54 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Laurent Destailleur
d7a14a15b3 Fix: Bad link 2013-09-06 09:26:23 +02:00
Raphaël Doursenaud
e762042828 Fixed typos 2013-09-05 18:06:51 +02:00
Florian Henry
2740cc78b6 Add dol_syslog 
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
 2013-09-05 17:45:30 +02:00
Florian Henry
ddeca06f32 Real ref filter 2013-09-03 21:13:05 +02:00
Florian Henry
cb86cd403c Fix: Delete linked element to supplier invoice when deleted (as done for 
all other object into dolibarr)
 2013-09-03 20:01:10 +02:00
Laurent Destailleur
3bfaadc054 Work on feature to change rule for vat calculation rounding 2013-09-03 18:08:50 +02:00
Laurent Destailleur
1f6d0ab3ef Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2013-08-27 09:36:54 +02:00
Raphaël Doursenaud
dcc87263d0 Update parameter as expected by the function name 2013-08-26 18:26:11 +02:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
 2013-08-24 22:41:32 +02:00
Laurent Destailleur
cafd75ac4a Revert a bad fix. 2013-08-24 21:55:02 +02:00
Christophe Battarel
26b8f29682 fix display of buying price on line edit when no supplier price is defined 2013-08-23 09:16:37 +02:00
Juanjo Menent
7e61c3703a Merge pull request #1189 from altairis-fr/3.4 
fix display of buying price on line edit when no supplier price is defined
 2013-08-23 00:15:00 -07:00
Florian Henry
aeb072b1eb Fix: Link "Show all supplier invoice" on suplier card not working 2013-08-23 09:02:50 +02:00
Florian Henry
4f991da846 Fix: Link "Show all supplier invoice" on suplier card not working 2013-08-22 15:11:11 +02:00
Christophe Battarel
32dd1e4480 fix display of buying price on line edit when no supplier price is defined 2013-08-22 10:45:42 +02:00
Christophe Battarel
d4bf87aa77 fix old bug on reordering supplier products in list 2013-08-21 15:31:08 +02:00
Christophe Battarel
9ac22149d4 fix old bug on reordering supplier products in list 2013-08-21 15:18:00 +02:00
Florian Henry
0a8c7f7639 Generate auto supplier invoice 2013-08-09 13:59:37 +02:00
Florian Henry
3cf3dbeb51 Add pdf link into supplier invoice list and supplier order list 2013-08-09 13:48:44 +02:00
braito4
561d0ea46b Update fiche.php 2013-08-07 20:48:50 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
d8778ce0f7 Fix: [ bug #1010 ] change index.php to list.php in fourn/fiche 2013-08-01 17:52:21 +02:00
Laurent Destailleur
a144b1307b Fix: [ bug #1010 ] change index.php to list.php in fourn/fiche 2013-08-01 17:49:17 +02:00
Maxime Kohlhaas
bfb01da04f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko1011 2013-07-30 16:22:13 +02:00
Maxime Kohlhaas
5a38a43c87 Task # 1011 : now supplier order and invoice deal with payment terms and mode 2013-07-30 16:21:39 +02:00
Maxime Kohlhaas
dae36229a4 Task # 1011 : add payment terms and payment mode on supplier card 2013-07-30 15:06:57 +02:00
Cédric Salvador
435deae5e9 removed one-liner 2013-07-29 12:31:15 +02:00
Cédric Salvador
14ea02ecac copyright 2013-07-29 12:31:06 +02:00
Cédric Salvador
b8f5aef27f some improvement to the wizard UI 2013-07-29 12:31:05 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Florian Henry
e82b8e9b9e Fix [ bug #990 ] Filter + sort does not work on order list 2013-07-26 12:16:39 +02:00
Laurent Destailleur
c4d3307bfa Qual: Normalize file name. 2013-07-26 11:36:36 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
 2013-07-24 15:25:00 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Juanjo Menent
8bae6a774d Merge pull request #1095 from atm-maxime/develop 
Fix on turnover reports
 2013-07-16 23:47:56 -07:00
Laurent Destailleur
f564d1912e New: Add graph for supplier invoices. 
Fix: Error management into supplier invoice validation.
 2013-07-16 18:43:38 +02:00
Maxime Kohlhaas
029394aa3f Fix : linked object not deleted when deleting a supplier invoice 2013-07-16 16:34:06 +02:00
Laurent Destailleur
a1e7663614 eol 2013-07-14 01:49:43 +02:00
Laurent Destailleur
89d8eb19c0 Fix: navigation fails 2013-07-14 01:29:26 +02:00
Laurent Destailleur
ada3df4245 eol 2013-07-14 01:21:00 +02:00
Laurent Destailleur
94e3277516 Fix: Navigation after using numbering for supplier ref. 2013-07-14 01:19:05 +02:00
Laurent Destailleur
4608e07753 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/bank/account.php
 2013-07-13 23:41:32 +02:00
Laurent Destailleur
55d14f430c Fix: Search on supplier ref 2013-07-13 23:36:21 +02:00
Laurent Destailleur
3f94950b0e Fix: Clean supplier ref 2013-07-13 16:54:17 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
548ea4f93f Fix: Navigation 2013-07-10 23:58:49 +02:00
Laurent Destailleur
c98545010b Fix: Navigation 2013-07-10 23:57:18 +02:00
Laurent Destailleur
7c163f7be3 Fix: Running fixdosfile onto all project 2013-07-07 13:17:48 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Laurent Destailleur
9be6dd8b17 Fix: Missing load 2013-07-05 23:10:47 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
869e877cb7 Qual: We must not concat currency symbol after a price, but use the 
parameter currency of method price.
 2013-06-17 11:58:55 +02:00
Laurent Destailleur
c748f3d834 Qual: Removed useless methods 
Qual: Removed deprecated vars
Qual: Free memory
 2013-06-16 21:31:21 +02:00
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with 
selec_project
 2013-06-14 22:33:01 +02:00
Laurent Destailleur
51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php
 2013-06-09 16:49:47 +02:00
Laurent Destailleur
1e0cb64bce Fix: Bad error management 2013-06-09 16:15:49 +02:00
Laurent Destailleur
9bb539843f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 16:14:19 +02:00
Laurent Destailleur
e85b72e452 Fix: Bad error management 2013-06-09 15:59:51 +02:00
Marcos García
3b28de0a07 Fixed some translation problems 2013-06-08 21:57:57 +02:00
Laurent Destailleur
4083d9a819 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-06 09:49:54 +02:00
Cédric Salvador
37ef86379f fixed bug when editing a supplier order line 2013-06-05 18:19:50 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
d1d329a6a2 Fix: Navigation into supplier invoices 2013-05-29 21:20:04 +02:00
Laurent Destailleur
3fc8de8dde Fix: Navigation into supplier invoices 2013-05-29 15:56:18 +02:00
simnandez
05aa11fce0 [ bug #914 ] It is not possible to validate a supplier invoice 2013-05-28 09:29:11 +02:00
simnandez
0c62942f03 [ bug #914 ] It is not possible to validate a supplier invoice 2013-05-28 09:28:31 +02:00
Laurent Destailleur
b61ca887d5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/cache.manifest
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
 2013-05-27 12:57:57 +02:00
Laurent Destailleur
e3e00b034b Fix: Dir with linked files was not renamed when invoices was renamed 
with its final ref (linked files were lost)
Fix: Ref visible into message was wrong.
Fix: Bad counting of product/service available
 2013-05-25 20:43:01 +02:00
Laurent Destailleur
701d8485ef Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
Laurent Destailleur
eecfbf9670 Fix: Bad link if not supplier defined for product 2013-05-24 18:55:04 +02:00
Laurent Destailleur
9ecb1ddcb4 Fix: Missing translation 2013-05-24 18:53:28 +02:00
Laurent Destailleur
b9f5c15542 Fix: Bad link if not supplier defined for product 2013-05-24 18:49:40 +02:00
Laurent Destailleur
92a7037c1d Fix: Missing translation 2013-05-24 18:20:28 +02:00
Laurent Destailleur
3b6c55f908 Fix: Param was renamed 2013-05-22 17:29:25 +02:00
fhenry
cb182752cc Report divert bug fixing from 3.4 2013-05-19 18:47:14 +02:00
Laurent Destailleur
3a11e0baad New: Script export-bank-receipts should be ready for test. 2013-05-14 23:59:59 +02:00
fhenry
68259c51eb Fix [ bug #886 ] Silent pgsql errors in 
/fourn/commande/fiche.php?action=create
 2013-05-07 17:09:31 +02:00
fhenry
8d6f959d31 Fix [ bug #864 ] fournisseur_extrafields 2013-05-01 22:57:03 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Laurent Destailleur
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +02:00
Laurent Destailleur
50dd0ef7ee Merge pull request #885 from FHenry/develop 
Review extrafield for compliance with wiki
 2013-04-26 13:08:37 -07:00
fhenry
5dce16863f Review delete extrafield in delete class method 2013-04-26 17:20:21 +02:00
fhenry
4ff5922a55 Fix pgSQL bug 2013-04-26 12:53:13 +02:00
fhenry
9e1487fc61 Fix bug Pgsql 2013-04-26 12:44:21 +02:00
Marcos García
6ac6f6e911 Fixed bug #846: Create a supplier invoice (without project) 2013-04-26 06:34:41 +02:00
Laurent Destailleur
36b314a2d6 Try to solve some problems with table (replaced by div). 2013-04-25 20:27:45 +02:00