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

1991 Commits

Author SHA1 Message Date
Laurent Destailleur
c30f13a03d Fix: label of input method not translated. 2014-10-12 02:07:50 +02:00
Florian HENRY
860253759b Add hook for addMorButton into supplier card 2014-09-23 11:59:57 +02:00
Juanjo Menent
c87e28d5f9 - Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since 
3.6.0 in supplier invoices when adding a line
 2014-09-19 09:57:35 +02:00
Juanjo Menent
ab83e22a12 Fix: Invoices payments may be older than invoices 2014-09-18 09:57:13 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
 2014-09-15 22:52:59 +02:00
Laurent Destailleur
822a3ebe7e Merge branch 'bug-1548' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1548

Conflicts:
	ChangeLog
 2014-09-14 21:37:15 +02:00
Marcos García de La Fuente
9426298b95 [ bug #1548 ] Supplier payment card shows type in French 2014-09-14 14:19:46 +02:00
Marcos García de La Fuente
949ae2f160 [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them 2014-09-14 13:09:31 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Laurent Destailleur
522b5a91bc Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c Fix: Filter on direction of payment mode was not working. 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/fiche.php
 2014-09-06 00:16:24 +02:00
Laurent Destailleur
643fc6c61f Fix: Bad use of fetch_lines 
Conflicts:
	htdocs/comm/propal.php
	htdocs/contrat/fiche.php
	htdocs/opensurvey/class/opensurveysondage.class.php
 2014-09-04 19:03:48 +02:00
Laurent Destailleur
0bc511a626 Merge pull request #1850 from braito4/patch-1 
Update fiche.php
 2014-09-02 19:12:09 +02:00
Laurent Destailleur
79b081a7b7 Merge pull request #1845 from Cubexed/patch-1 
Fix unable to delete order line
 2014-08-28 12:00:21 +02:00
Philippe GRAND
08c621037c fix : missing code for extrafields 2014-08-27 11:41:18 +02:00
braito4
f5883741bf Update fiche.php 
Proyect selection was missing
 2014-08-26 20:20:29 +02:00
Cubexed
a97241f716 Fix unable to delete order line 
Calling trigger without having globalized $conf causes error and cancels delete operation, this commit adds the missing

2014-08-23 16:52:05 ERR     127.0.0.1        Interfaces::run_triggers was called with wrong parameters action=LINEORDER_SUPPLIER_DELETE object=1 user= langs= conf=
 2014-08-23 17:05:08 +02:00
Laurent Destailleur
6c316d0cda Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-13 19:23:45 +02:00
Maxime Kohlhaas
1caf39ad22 Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5 2014-08-07 12:26:18 +02:00
Laurent Destailleur
20cef1512f Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 21:34:47 +02:00
Laurent Destailleur
98eb39bf9c Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported 2014-08-06 16:46:04 +02:00
Maxime Kohlhaas
546b31b9d0 Fix : Filtering on fourn paiement list was not working 2014-08-06 12:02:44 +02:00
Juanjo Menent
8cd2e00e5f Fix: [ bug #1521 ] The second order's page from a provider shows all 
orders
 2014-07-21 16:57:08 +02:00
Laurent Destailleur
8137fd7fe4 Fix: Type of line (product/service) could not be edited on supplier 
order/invoice.
 2014-07-20 02:36:03 +02:00
Juanjo Menent
47cff4d407 Fix: Unable to add lines in supplier orders 2014-07-04 10:04:30 +02:00
Laurent Destailleur
14de1d66c0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-29 23:56:23 +02:00
Laurent Destailleur
dd1c5ce3d8 Fix: Missing commit 2014-06-28 15:03:11 +02:00
Laurent Destailleur
71ee974ddb Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-06-28 14:53:28 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
Cedric
e21e4dbf11 - FIX #1482 #1484 #1486 
- Add missing triggers in interface_90
 2014-06-24 11:49:53 +02:00
Cedric
00779dd8fa FIX #1460, #1461 2014-06-24 10:53:18 +02:00
Laurent Destailleur
04ead87aea Merge pull request #1681 from KreizIT/FIX1485 
FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless
 2014-06-23 20:20:31 +02:00
Cedric
0f267559c6 FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless loop 2014-06-23 12:28:59 +02:00
Laurent Destailleur
b4add020a9 Fix: Question about warehouse must not be done when module stock is 
disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
 2014-06-23 11:47:07 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
28fd8c6862 Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top 
margin.
 2014-06-20 14:04:37 +02:00
Laurent Destailleur
e7f08c6d37 Merge pull request #1674 from atm-maxime/3.5 
Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix...
 2014-06-20 13:20:50 +02:00
Florian HENRY
40f5911f52 Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a 
product (on supplier order part)
 2014-06-20 09:36:31 +02:00
Maxime Kohlhaas
aaabf9647d Fix 1462, 1468, 1480, 1483, 1490, 1497 $this instead of $object (3.5 fix) 2014-06-20 09:33:25 +02:00
Maxime Kohlhaas
bd21a559da Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-06-20 09:06:36 +02:00
Florian HENRY
03156b58e3 [ bug #1452 ] variable used but not defined 2014-06-17 11:30:41 +02:00
Laurent Destailleur
b70c695776 Fix: checkstyle 2014-06-16 18:41:28 +02:00
Laurent Destailleur
4c0fe98ae2 Merge pull request #1665 from atm-maxime/develop 
Fix 1480, 1483, 1497 $this instead of $object
 2014-06-14 14:13:10 +02:00
Laurent Destailleur
11cb23f4ac Merge pull request #1662 from grandoc/3.5 
Fix : num paiement was not displayed
 2014-06-14 13:28:22 +02:00
Maxime Kohlhaas
19a3194b02 Fix : duedate was not auto calculated + move calculation function to common invoice class 2014-06-14 12:53:02 +02:00
Laurent Destailleur
0453daae72 Merge pull request #1656 from netfab/3.5 
html fix : missing </tr>.
 2014-06-14 12:34:06 +02:00
Maxime Kohlhaas
d0a417ad36 Fix 1480, 1483, 1497 $this instead of $object 2014-06-14 11:37:57 +02:00
philippe
18080deb93 Fix num paiement was not displayed 2014-06-13 12:16:49 +02:00
philippe
d508c076e8 Fix : num paiement was not displayed 2014-06-13 12:10:26 +02:00