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

9050 Commits

Author SHA1 Message Date
Marcos García de La Fuente
3029fd0fe1 FIX #5540 getFormMail is not registered as addReplace hook 2016-07-25 13:18:41 +02:00
Marcos García de La Fuente
3ef3a038cf Merge branch '3.9' into bug-5537 2016-07-25 11:50:08 +02:00
Marcos García de La Fuente
a9d75b2c91 FIX #5537 AJAX project search does not work properly 2016-07-25 11:49:04 +02:00
Laurent Destailleur
10e7fa51fc Fix missing parameters to provide all information required for 
substitution hooks
 2016-07-13 23:06:41 +02:00
Laurent Destailleur
dc51eb0b75 Fix missing badge 2016-07-13 22:21:18 +02:00
Laurent Destailleur
0367cee671 FIX We must take the last recent defined price when using price level 2016-07-11 11:34:11 +02:00
Laurent Destailleur
a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
 2016-07-06 14:53:05 +02:00
Maxime Kohlhaas
d658e2cf31 FIX task ODT company object not correctly retrieved 2016-07-05 16:04:18 +02:00
Laurent Destailleur
625213580c Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2016-07-01 03:17:20 +02:00
Laurent Destailleur
3645bd8f69 Merge pull request #5420 from atm-alexis/FIX_3.8_bug_5170 
FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option
 2016-07-01 03:06:31 +02:00
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
c9300bae35 Merge pull request #5415 from fmarcet/3.8 
Fix: Incorrect document link on supplier invoices's list
 2016-06-30 22:31:18 +02:00
Alexis Algoud
22bc44620b FIX #5170 tva sign with INVOICE_POSITIVE_CREDIT_NOTE option 2016-06-30 14:27:58 +02:00
fmarcet
e4a2b5abb3 Fix: Incorrect document link on supplier invoices's list 2016-06-30 11:27:29 +02:00
gauthier
d9035e5308 FIX : receiving link never works 2016-06-28 11:41:23 +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
Frédéric FRANCE
3690d11ca2 Update pdf.lib.php 2016-06-23 10:48:52 +02:00
Laurent Destailleur
386b19d4b1 Fix regression. Add hidden option PROPAL_DISABLE_SIGNATURE to restore 
old behaviour.
 2016-06-19 17:56:34 +02:00
Laurent Destailleur
d717757594 Protect against bad value of accurancy to avoid javascript error 2016-06-17 10:40:11 +02:00
Laurent Destailleur
a3d53b269f FIX javascript error with german-switzerland language 2016-06-17 10:35:18 +02:00
root
b3d58e9510 FIX large expense note 2016-06-08 14:36:52 +02:00
Maxime Kohlhaas
0ab4827091 FIX #5087 2016-06-05 02:06:32 +02:00
Laurent Destailleur
c07933729a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-05 00:29:40 +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
a5472b58d1 FIX #5108 2016-06-05 00:24:00 +02:00
Laurent Destailleur
db2269b9dd Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:12:34 +02:00
Maxime Kohlhaas
7866fb9dae Fix #5153 2016-06-04 19:11:32 +02:00
Maxime Kohlhaas
3ef9fe2c40 Fix product supplier price modification with multicompany 2016-06-04 18:10:40 +02:00
phf
a62f5bd5b4 Fix #2777 2016-06-04 17:17:22 +02:00
phf
8ccda16ef3 Fix call function ldap_connect but not exists 2016-06-04 14:50:32 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
phf
01b881a0a6 Fix builddoc with odt lost value of extrafields as "sellist" on view card 2016-06-04 13:24:42 +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
Laurent Destailleur
c663ca13b8 Fix edit left menu 2016-06-01 21:41:47 +02:00
Laurent Destailleur
bf5fbd3a80 FIX Infinite loop on menu tree output for edition 
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
 2016-06-01 21:14:28 +02:00
Laurent Destailleur
ee420b79b1 FIX Infinite loop on menu tree output for edition 
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
 2016-06-01 17:52:06 +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
Laurent Destailleur
ed148f70b3 FIX Filter on assigned to was preselected on current user on list "All 
events" (instead of no filtering)
 2016-05-30 18:12:27 +02:00
Laurent Destailleur
2290f6a123 FIX Menu statistics was not visible if module proposal was not enabled 2016-05-30 13:11:44 +02:00
gauthier
1ce91bac06 FIX : same page added several times on mergepropal option 2016-05-25 11:25:19 +02:00
Xebax
2355a0c38c FIX #5236 Cron module activated but "Modules tools" does not appear in the left menu. 2016-05-22 17:15:22 +02:00
Frédéric FRANCE
3607f1a296 Correction for Auguria Menu Accounting Expert 
Entry cause blank windows
 2016-05-09 22:15:00 +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
0735413e7c Merge pull request #5101 from altatof/fix_fournprice_select 
FIX: end of select when no fournprice
 2016-04-29 20:36:44 +02:00
BENKE Charlie
31a9acc77d </option> not present in some select list 2016-04-29 20:18:26 +02:00
esprit libre
f5a541d469 Fix problem about unit buy price fetching 
To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price.
Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges
 2016-04-29 19:41:47 +02:00
Christophe Battarel
2a0c508d47 FIX: end of select when no fournprice 2016-04-25 11:26:13 +02:00
Laurent Destailleur
230807b292 Merge pull request #5056 from frederic34/patch-10 
FIX If oauth has never been activated two tables are missing and printing is not working
 2016-04-22 19:42:21 +02:00
Frédéric FRANCE
fd9fb505b9 Update printgcp.modules.php 2016-04-21 07:53:22 +02:00