Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-09 01:12:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,024 Commits 39 Branches 191 Tags
7ecb263a0410d2f6729bbce95deebb677fc97349
Commit Graph

52024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
abb
7ecb263a04 Merge branch 'develop' of https://github.com/bafbes/dolibarr into dev 2016-02-15 00:20:19 +01:00
abb
3e6eca546a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev 
Conflicts:
	htdocs/fichinter/card.php
	htdocs/langs/en_US/products.lang
 2016-02-15 00:06:51 +01:00
Laurent Destailleur
4bb980830f Merge pull request #4571 from defrance/patch-99 
Add Good Customers Boxes
 2016-02-14 20:56:22 +01:00
Laurent Destailleur
d6227fd981 Merge pull request #4611 from bafbes/abb-0 
urgent fix : start of transaction without finish
 2016-02-14 12:51:30 +01:00
Laurent Destailleur
a8c305f820 Merge pull request #4617 from aspangaro/develop-p5 
New: Weather icons depends of the theme
 2016-02-14 12:50:12 +01:00
Laurent Destailleur
0e7739fa85 Merge pull request #4604 from IonAgorria/fix_productsupplierprice 
Fix missing vars in fetch_product_fournisseur_price
 2016-02-14 12:47:02 +01:00
Laurent Destailleur
b93e25a00d Merge pull request #4601 from grandoc/develop 
Add MAIN_VIEW_LINE_NUMBER for members list
 2016-02-14 12:34:18 +01:00
Laurent Destailleur
030bec5ad7 Merge pull request #4619 from aspangaro/develop-p7 
Correct travis
 2016-02-14 12:19:35 +01:00
Ion Agorria
1f99ce8ae9 Fix var typo 2016-02-14 01:21:56 +01:00
Laurent Destailleur
07afad41a2 Add feature to select number of record into list in the skeleton 
template.
 2016-02-13 10:54:06 +01:00
Laurent Destailleur
006c546a87 Fix select number of records in list 2016-02-13 10:51:42 +01:00
aspangaro
45cc841b92 Correct travis 2016-02-13 08:10:13 +01:00
aspangaro
47f60e1f8d Add function img_weather 2016-02-13 07:53:50 +01:00
aspangaro
5e608c9ab4 Move files from common directory to each template 2016-02-13 06:58:46 +01:00
Laurent Destailleur
298be09ee2 Uniformize behaviour by adding the back to list on thirdparty card 2016-02-13 03:38:56 +01:00
Laurent Destailleur
cd3a531449 Debug multicurrency 2016-02-13 03:33:41 +01:00
Laurent Destailleur
ecc338b1eb Clean module 2016-02-13 03:25:20 +01:00
Laurent Destailleur
04114a5e1e Provide a better explanation on how the module dynamic price works 2016-02-13 03:11:27 +01:00
abb
0063635c67 fix:no transaction in this place 2016-02-13 00:00:20 +01:00
Laurent Destailleur
94732b8ae9 NEW When emailing is not sent completely, show progression 2016-02-12 14:23:40 +01:00
Laurent Destailleur
d0ab1db19b NEW When emailing is not sent completely, show progression 2016-02-12 14:21:44 +01:00
Laurent Destailleur
2796875ed1 Can select size of list of targets of email 2016-02-12 13:58:24 +01:00
Laurent Destailleur
158906455a NEW Can change dynamically number of records visible into lists. 2016-02-11 20:40:33 +01:00
Ion Agorria
1a45ab9d50 Fix missing vars in fetch_product_fournisseur_price 2016-02-11 20:29:45 +01:00
Laurent Destailleur
bc33b19d7d NEW Can change dynamically number of records visible into lists. 2016-02-11 20:24:15 +01:00
Laurent Destailleur
e67be201ed NEW Can select number of lines on page list for projects and tasks 2016-02-11 16:49:13 +01:00
philippe grand
a430b59bac Add MAIN_VIEW_LINE_NUMBER for members list 2016-02-11 09:41:45 +01:00
Laurent Destailleur
0d7f67ade5 Merge remote-tracking branch 'origin/3.9' into develop 2016-02-10 23:59:15 +01:00
Laurent Destailleur
e169cd3364 Fix usage of filter into selection of email members into emailing. 2016-02-10 23:48:18 +01:00
Laurent Destailleur
6662c1b5e1 NEW Can select dynamicaly number of lines to show on page on product, 
shipment, contact, orders, thirdparties
Fix can make a shipment for product not predefined in multiwarehouse
mode
 2016-02-10 23:37:34 +01:00
Laurent Destailleur
9b41e11a1e NEW Can select dynamicaly number of lines to show on page 2016-02-10 20:48:18 +01:00
Laurent Destailleur
ab2ac26f17 NEW When a field to show into list is selected, the form is 
automatically submited
 2016-02-10 19:27:22 +01:00
Laurent Destailleur
6dbaba6973 Fix: previous and next arrow 2016-02-10 17:45:26 +01:00
Laurent Destailleur
5c1c413c02 Fix warning 2016-02-09 15:44:34 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
223195538a Return bad late or not status for order 2016-02-09 14:29:12 +01:00
Laurent Destailleur
f640bf7c61 Manage the reply-to field into mail libs 2016-02-09 11:56:12 +01:00
Laurent Destailleur
805940f61c Merge pull request #4539 from bafbes/patch-22 
Set mail reply-to field to sender in smtps class
 2016-02-09 10:17:33 +01:00
Laurent Destailleur
d89daf9cd2 Work to move the merge pdf tool into the mass action combo of lists 2016-02-08 18:04:42 +01:00
Laurent Destailleur
50eae967bc Fix disabled entries were no greyed 2016-02-08 17:48:14 +01:00
Laurent Destailleur
bfcf1e01e8 Fix alignement 2016-02-08 16:51:29 +01:00
Laurent Destailleur
7445a0f71c Clean code for generating sheet of barcode. Can choose output filename. 2016-02-08 16:42:34 +01:00
Laurent Destailleur
404663472a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-08 15:50:34 +01:00
Laurent Destailleur
0b6bd0bc14 More robust error management on barcode module. 2016-02-08 15:49:38 +01:00
BENKE Charlie
c672ad9fed Update box_goodcustomers.php 2016-02-08 15:00:49 +01:00
Laurent Destailleur
fcf1e20d5b Merge pull request #4578 from frederic34/sticker 
Dictionnary for label sticker and card format
 2016-02-08 14:49:31 +01:00
Sof
19b333f78b FIX : Typo 2016-02-08 14:48:05 +01:00
Laurent Destailleur
b5ca02fddf Merge pull request #4576 from mrsof/patch-5 
TYPO : Syntax error in golbal var
 2016-02-08 14:46:57 +01:00
Laurent Destailleur
77531f938b Merge pull request #4582 from aspangaro/3.9-p10 
Fixed: 3.9rc Problem of merging Review page init accountancy
 2016-02-08 14:45:45 +01:00
Laurent Destailleur
d2708a4225 Merge pull request #4475 from atm-ph/new_multicurrency_module 
New multicurrency module
 2016-02-08 14:44:49 +01:00