Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

6584 Commits

Author SHA1 Message Date
Alexis Algoud
8221817087 NEW add an option to use standard ISO location for bill in crabe model 
For electronic sending solutions, it could be required
 2015-11-05 16:17:09 +01:00
philippe grand
b9c0cd316f [Qual] Fix : TODO:translate 2015-11-05 11:11:51 +01:00
Laurent Destailleur
41ccfc411a Better error message 2015-11-05 10:11:39 +01:00
Laurent Destailleur
1f4481a6b0 Merge pull request #3172 from atm-maxime/new_creditnote 
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
 2015-11-05 02:45:15 +01:00
Laurent Destailleur
11b7d8a44c Merge pull request #3873 from frederic34/escpos 
Escpos Receipt printer
 2015-11-05 02:18:09 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
 2015-11-05 01:50:30 +01:00
frederic34
644a104d5f start to parse template 2015-11-04 23:14:50 +01:00
frederic34
d362d889f6 wip 2015-11-03 20:50:01 +01:00
Laurent Destailleur
cd68ea9d0f Fix: We must use external URL for OAuth. 2015-11-02 21:42:11 +01:00
Laurent Destailleur
ffe1284a85 Merge pull request #3840 from frederic34/printgcp 
Printing with Google Cloud Print
 2015-11-02 20:09:13 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
055fe5e275 FIX #3786 Translation of select box. 2015-11-02 19:17:22 +01:00
Laurent Destailleur
bb26e1c195 Merge pull request #3860 from frederic34/patch-5 
Update resource.lang
 2015-11-02 18:06:31 +01:00
Frédéric FRANCE
76c89884ba Update resource.lang 2015-11-02 17:32:02 +01:00
Frédéric FRANCE
ebf6493987 Typo 2015-11-02 17:31:03 +01:00
Laurent Destailleur
c119859696 NEW The quick search box on left menu can also search into expense 
reports.
 2015-11-02 13:14:46 +01:00
frederic34
9149032a03 Merge remote branch 'upstream/develop' into printgcp 
Conflicts:
	htdocs/core/actions_printing.inc.php
 2015-11-02 11:43:34 +01:00
Laurent Destailleur
1a0179dd1f More complete help 2015-11-02 11:08:36 +01:00
Laurent Destailleur
200e4638f4 Merge pull request #3812 from fappels/develop-best-pmp-pos-margin 
Fix: #2591 Margin is incorrect used with POS
 2015-11-02 11:06:20 +01:00
Laurent Destailleur
a161e6d47a Continue debug of PRODUIT_MULTIPRICES option. 
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
 2015-11-02 10:09:09 +01:00
frederic34
bb06a55844 Work on list jobs 2015-10-31 23:27:10 +01:00
Juanjo Menent
a58b5f26f6 Merge pull request #3774 from marcosgdf/multiprice-generator 
NEW Level multiprice generator based on per cent variations over base price
 2015-10-31 23:03:19 +01:00
frederic34
22d1cf860c Add translation 2015-10-31 22:09:50 +01:00
frederic34
df3af6979e Translation in paypal lib 2015-10-31 21:43:59 +01:00
Marcos García de La Fuente
e1f2efee4d Merge branch 'develop' into multiprice-generator 
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-10-31 11:46:14 +01:00
frederic34
b6be372c4b Merge remote branch 'upstream/develop' into printgcp 2015-10-30 18:12:34 +01:00
frederic34
1694c690ed Printing with Google Cloud Print 2015-10-30 17:22:06 +01:00
Laurent Destailleur
6cc3df7e71 NEW Quick searh filter works on invoice, proposal, order, intervention, 
contract
 2015-10-30 08:35:56 +01:00
Juanjo Menent
de6bef82dd Merge pull request #3820 from grandoc/develop 
[Qual] Uniformize code
 2015-10-29 10:54:36 +01:00
aspangaro
4e9d06785c Fix #3818 & presentation 2015-10-29 06:47:42 +01:00
aspangaro
e2ba24826f Review 3.8 2015-10-29 06:06:56 +01:00
Laurent Destailleur
4042c6d5cc Minor fixes 2015-10-28 23:02:02 +01:00
Laurent Destailleur
f5eaeb2fb5 Some minor fixes 2015-10-28 22:51:06 +01:00
Laurent Destailleur
8e1fd5c3ed Uniformize labels and css style 2015-10-28 22:25:15 +01:00
philippe grand
d517595f82 [Qual] Uniformize code 2015-10-28 19:28:18 +01:00
Juanjo Menent
a36559c55c Merge pull request #3809 from aspangaro/develop-hrm 
HRM module : continue to work
 2015-10-28 16:11:17 +01:00
Laurent Destailleur
87c240252c FIX Can export a field into task time table with export project profile 2015-10-27 22:24:18 +01:00
Laurent Destailleur
f9c9c58cba Label must be cheque or transfer 2015-10-27 20:36:27 +01:00
Laurent Destailleur
fb28586f32 Better visible of what is possible for stock management 2015-10-27 19:18:22 +01:00
Marcos García de La Fuente
eff1f73950 Merge branch 'develop' into multiprice-generator 
# Conflicts:
#	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
#	htdocs/product/price.php
 2015-10-27 10:41:50 +01:00
aspangaro
93d340e497 HRM module : continue to work 2015-10-27 07:26:57 +01:00
fappels
4d839eea60 Fix #2591 Margin is incorrect used with POS 
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
 2015-10-26 20:33:42 +01:00
Laurent Destailleur
6493438e87 NEW The clicktodial module is now able to provide link "tel:" on phone 
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
 2015-10-26 16:20:09 +01:00
Laurent Destailleur
d5e42478a9 Removed deprecated options to show or not forms. Such forms does not 
exists anymore.
 2015-10-26 12:37:36 +01:00
Laurent Destailleur
5c4ac0bf62 NEW Merge all left menu search boxes into one. 2015-10-26 12:18:22 +01:00
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
Laurent Destailleur
080ba15e0d FIX The price per level just never correctly manage the vat. Vat is not 
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
 2015-10-25 22:50:05 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
 2015-10-25 19:54:41 +01:00
Laurent Destailleur
1b8234d9fe Bette behaviour for blind people 2015-10-25 11:09:50 +01:00
Laurent Destailleur
082e41b6c0 Bette translation 2015-10-24 13:58:28 +02:00