Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,397 Commits 35 Branches 179 Tags 1.7 GiB
d5f221452e
Commit Graph

5953 Commits

Author SHA1 Message Date
Laurent Destailleur
29e26c2342 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/sendings.lib.php
 2016-07-01 02:06:30 +02:00
Laurent Destailleur
5c11192c7c Merge pull request #5425 from atm-arnaud/fix_4749 
FIX #4749
 2016-06-30 22:20:18 +02:00
Maxime Kohlhaas
d004f3a538 FIX #4448 $filebonprev is not used, $this->filename now 2016-06-30 17:03:56 +02:00
arnaud
0ffe106e2c FIX #4749 2016-06-30 16:03:48 +02:00
Laurent Destailleur
1368e6d462 Fix: error message was not enough to understand 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-06-24 21:32:38 +02:00
Laurent Destailleur
f6119cfee8 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2016-06-23 21:03:08 +02:00
Laurent Destailleur
9b50150fe8 FIX #5380 2016-06-23 20:54:04 +02:00
Juanjo Menent
0d62bd704e Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated 2016-06-22 18:59:51 +02:00
Laurent Destailleur
630a063283 FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries

Conflicts:
	htdocs/compta/facture.php
 2016-06-15 18:24:15 +02:00
Laurent Destailleur
4c922f073b FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries
 2016-06-15 18:21:58 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Juanjo Menent
43d475aa42 Merge pull request #5272 from simnandez/3.9 
Fix issues with strict mode
 2016-06-04 10:07:01 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
Juanjo Menent
66c73015b2 Fix issues with strict mode 2016-06-03 23:58:54 +02:00
Laurent Destailleur
460d7ce915 FIX Split of credit note into discount page generates records not 
correctly recognised as credit note.
 2016-05-30 19:38:28 +02:00
gauthier
71ee941cf8 FIX : SQL error function on getAvailableDiscounts function, on bill create mode if socid is empty 2016-05-25 12:25:39 +02:00
Laurent Destailleur
3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php
 2016-04-29 20:42:35 +02:00
Laurent Destailleur
53386e22ea Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/index.php
 2016-04-29 20:39:17 +02:00
Laurent Destailleur
b0b1056a44 Merge pull request #5121 from fmarcet/3.7 
Fix: Not filtering correctly on supplier invoice's list
 2016-04-29 17:19:15 +02:00
fmarcet
33499ae652 FIX: Compatible with multicompany 2016-04-28 11:14:00 +02:00
Maxime Kohlhaas
0a67614e72 Fix wrong qty total in ca by prod/serv report 2016-04-28 09:10:22 +02:00
Laurent Destailleur
dd443fe7f5 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
 2016-04-21 02:42:43 +02:00
Laurent Destailleur
0c932e0ee6 Merge pull request #4997 from atm-maxime/fix_vat_on_credit_note 
Fix VAT amount on credit note was > 0 when manually entered
 2016-04-19 19:21:05 +02:00
Juanjo Menent
ecbf5996c1 FIX #4961 2016-04-15 17:20:37 +02:00
Juanjo Menent
9f4ccfab95 FIX #3815 With higher quality 2016-04-15 15:54:51 +02:00
Juanjo Menent
c5ecc46a22 FIX #3815 With higher quality 2016-04-15 15:42:58 +02:00
Juanjo Menent
4446e6a36c FIX #3815 Call to undefined function local_by_date(). branch 3.8 2016-04-15 12:47:21 +02:00
Juanjo Menent
2d3b2c08b5 FIX #3815 Call to undefined function local_by_date(). branch 3.7 2016-04-15 10:56:03 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Maxime Kohlhaas
25dcca301f Fix VAT amount on credit note was > 0 when manually entered 2016-04-12 09:47:35 +02:00
Laurent Destailleur
46dd3c0cec Merge pull request #4982 from marcosgdf/bug-4737 
FIX #4737 Bank transacion type selector translation is cropped
 2016-04-11 18:58:26 +02:00
Juanjo Menent
4f5d96150a Merge pull request #4977 from marcosgdf/bug-4766 
FIX #4766 VAT not shown in supplier invoice popup
 2016-04-10 11:42:29 +02:00
Marcos García de La Fuente
3135cf720d FIX #4737 Bank transacion type selector translation is cropped 
Close #4737
 2016-04-09 22:59:12 +02:00
Marcos García de La Fuente
9169adf4ce FIX #4766 VAT not shown in supplier invoice popup 
Close #4766
 2016-04-09 22:34:55 +02:00
Laurent Destailleur
39b61d6924 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/boxes/box_task.php
	htdocs/core/lib/files.lib.php
 2016-04-07 19:27:53 +02:00
Frédéric FRANCE
d4529d19c7 Update facture.php 
ref_client in order
ref_customer in shipping
 2016-04-01 17:32:58 +02:00
Laurent Destailleur
884ba3a0ba Fix bad hook function name 2016-03-25 16:23:09 +01:00
Laurent Destailleur
9ddae7d7f3 Fix bad hook function name 2016-03-25 16:17:01 +01:00
Laurent Destailleur
f251ca579b Fix bad hook function name 2016-03-25 16:15:35 +01:00
Laurent Destailleur
7430d09739 Fix bad hook function name 2016-03-25 16:13:22 +01:00
Laurent Destailleur
5e55f0ecce Fix bad function name into hook 2016-03-25 16:07:42 +01:00
Laurent Destailleur
bdead30e75 FIX Missing function 2016-03-25 14:42:16 +01:00
Laurent Destailleur
ee857055be Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-19 19:26:25 +01:00
Laurent Destailleur
660f825a34 Fix regression description line not visible 2016-03-19 19:25:28 +01:00
Laurent Destailleur
4436ec954f Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-19 19:15:23 +01:00
Laurent Destailleur
f0eb8ac794 Fix regression Product ref not visible 2016-03-19 19:13:27 +01:00
Laurent Destailleur
b4e775dd35 FIX Parsing of amount to pay vat 2016-03-18 19:42:56 +01:00
Laurent Destailleur
c5e744bfc2 FIX #4839 2016-03-18 12:16:40 +01:00
Laurent Destailleur
7fa71214bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
 2016-03-18 11:06:41 +01:00