Commit Graph

53200 Commits

Author SHA1 Message Date
abb
2f99273734 fix:no transaction in this place 2016-02-14 20:51:36 +01:00
Laurent Destailleur
666a3d907d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-14 20:48:39 +01:00
Laurent Destailleur
b7ae5bac6f Fix: The text "All" is not appropriate. 2016-02-14 20:48:25 +01:00
Laurent Destailleur
cc174daa13 Prepare 3.8.4 2016-02-14 20:12:47 +01:00
Ion Agorria
0e2be880c5 Convert null to string 2016-02-14 19:05:43 +01:00
Ion Agorria
89657d0439 Changed Price Parser functions and added testExpression 2016-02-14 17:28:31 +01:00
Ion Agorria
6bfc3f446f Use setSupplierPriceExpression instead of product setPriceExpression 2016-02-14 16:35:23 +01:00
Ion Agorria
b1568a7319 Better Add buttons in dynamicprice module 2016-02-14 16:35:17 +01:00
Ion Agorria
99efbd3464 Check if dynamic price is enabled 2016-02-14 16:09:47 +01:00
Laurent Destailleur
b091d4e897 Merge pull request #4586 from hregis/3.8_bug
Fix: missing signature and uniformize code between card and script
2016-02-14 15:50:36 +01:00
Laurent Destailleur
e28c3a3ee7 Merge pull request #4585 from grandoc/3.8
fix : Strict Standards: Only variables should be passed by reference
2016-02-14 12:53:09 +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
a022665db8 Merge pull request #4607 from atm-gauthier/3.8_fix_search_customer_product_price
FIX : search product in customer product prices doesn't work
2016-02-14 12:33:49 +01:00
Laurent Destailleur
9f75ac499f Merge pull request #4606 from frederic34/patch-9
Update 3.8.0-3.9.0.sql
2016-02-14 12:25:54 +01:00
Laurent Destailleur
d973596601 Merge pull request #4587 from frederic34/patch-7
Update modOauth.class.php
2016-02-14 12:21:03 +01:00
Laurent Destailleur
030bec5ad7 Merge pull request #4619 from aspangaro/develop-p7
Correct travis
2016-02-14 12:19:35 +01:00
Frédéric FRANCE
e7a7909b9d Update rappro.php 2016-02-14 12:16:17 +01:00
Ion Agorria
1f99ce8ae9 Fix var typo 2016-02-14 01:21:56 +01:00
BENKE Charlie
9f4909d8b1 Update categorie.class.php 2016-02-13 17:27:53 +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
BENKE Charlie
23cb0d437c Update 3.9.0-4.0.0.sql 2016-02-13 10:53:01 +01:00
Laurent Destailleur
006c546a87 Fix select number of records in list 2016-02-13 10:51:42 +01:00
BENKE Charlie
b21b5e7bb8 Create llx_categorie_user.key.sql 2016-02-13 10:51:24 +01:00
BENKE Charlie
e3444e08a7 Create llx_categorie_user.sql 2016-02-13 10:50:46 +01:00
BENKE Charlie
5e288db0e5 add categorie user based on contact user
allow to add categorie to user, the same as contact user (because user and contact are persons too)
2016-02-13 10:42:45 +01:00
BENKE Charlie
c910fd151f add setcategorie on user class 2016-02-13 10:27:12 +01:00
BENKE Charlie
a95a810d68 add categorie user based on contact user 2016-02-13 10:25:37 +01:00
aspangaro
45cc841b92 Correct travis 2016-02-13 08:10:13 +01:00
aspangaro
9c20bf1b2e Updated: User accountancy code depends on Accounting module, not Salaries module 2016-02-13 08:03:49 +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
4dce09cd27 include expense reports in linked objects section and provide template for them in this section
Conflicts:
	htdocs/core/class/html.form.class.php
2016-02-13 00:37:38 +01:00
abb
0063635c67 fix:no transaction in this place 2016-02-13 00:00:20 +01:00
phf
4f6289bea0 Fix test if frequency is defined to create or not by the cron 2016-02-12 16:09:50 +01:00
phf
1143612bc0 Fix add key in traduction lang 2016-02-12 16:03:01 +01:00
phf
428a7e7042 FIX remove comment, calcul next date for recurring invoice, increment nb_gen_done 2016-02-12 15:55:55 +01:00
Laurent Destailleur
e9ffbd1406 FIX When an email was partially sent from GUI, it was not possible to
finish from CLI.
2016-02-12 14:27:59 +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
phf
c4812abd62 Fix can update fields of facture rec
Fix create invoice from facture rec don't get all properties and add fk_account
2016-02-12 12:31:43 +01:00
Laurent Destailleur
969314e731 Fix: disabling option lead in not working dolibarr 2016-02-12 12:19:32 +01:00
Laurent Destailleur
1c6d154a77 Fix: disabling option lead in not working dolibarr 2016-02-12 12:19:11 +01:00