Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
41,258 Commits 36 Branches 189 Tags
e62edc0a729fb168e793189ba872b51ec2dee325
Commit Graph

35487 Commits

Author SHA1 Message Date
Raphaël Doursenaud
e62edc0a72 Fix undeclared variable 2014-04-23 11:19:34 +02:00
Laurent Destailleur
0058bea8e0 Fix typo 2014-04-23 10:22:03 +02:00
Laurent Destailleur
5c653b3a34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-22 23:52:41 +02:00
Laurent Destailleur
2b191b6ef8 Uniformization and simplification of code. 2014-04-22 23:49:33 +02:00
Juanjo Menent
f97d162087 Merge pull request #1543 from GPCsolutions/taskautoevents 
Automatic events for project tasks
 2014-04-22 18:10:57 +02:00
Raphaël Doursenaud
d95b5e4a39 Fixed typo 2014-04-22 16:43:19 +02:00
Raphaël Doursenaud
e6c0321fb6 Automatic events for project tasks 2014-04-22 15:30:10 +02:00
Juanjo Menent
d527c4cf73 Fix: Price min of composition is not supplier price min by quantity 2014-04-22 09:57:43 +02:00
Laurent Destailleur
0a8ab84b1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-22 00:04:50 +02:00
Laurent Destailleur
76b5659d4c Optimize for small screen 2014-04-22 00:04:31 +02:00
Laurent Destailleur
2b7c2a9040 Merge pull request #1535 from fxw/patch-1 
Update server_thirdparty.php
 2014-04-20 00:01:48 +02:00
Laurent Destailleur
825ae377b0 Merge pull request #1534 from squarou/develop 
Add 2 lang variables for new tab in adherent
 2014-04-19 23:59:24 +02:00
Laurent Destailleur
1c21dbc9e7 Merge pull request #1533 from FHenry/develop 
Add filter date and total line on bank writing list page
 2014-04-19 23:58:48 +02:00
BENKE Charles
c55e51d825 Update project.class.php 2014-04-19 14:59:42 +02:00
BENKE Charles
ebab7a0b62 Update element.php 2014-04-19 13:06:11 +02:00
BENKE Charles
cebbf1607c Update element.php 2014-04-19 13:00:42 +02:00
BENKE Charles
09d231ad0a Update project.class.php 2014-04-19 12:36:15 +02:00
BENKE Charles
0b78a04756 Update doc_generic_project_odt.modules.php 2014-04-19 12:32:01 +02:00
Laurent Destailleur
bb2c829997 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
 2014-04-18 12:34:32 +02:00
Laurent Destailleur
ee3592c976 Fix: invert label for accountancy_code_sell 2014-04-18 11:21:15 +02:00
Laurent Destailleur
229e5211c5 Sync from transifex 2014-04-18 11:04:12 +02:00
Laurent Destailleur
61f0d67da0 Avoid too long filenames 2014-04-16 23:00:30 +02:00
fxw
f86d49c1ac Update server_thirdparty.php 
For the method getListOfThirdParties, return all the extrafieldsOptions of the thirdParty Object
 2014-04-16 16:33:36 +02:00
Laurent Destailleur
ce34c01b9e New: On page to enter supplier prices, if there is no supplier, add 
direct link to create one.
Qual: The following hooks are now 'addreplace'
hooks: "formCreateThirdpartyOptions" so check that return value is 0 to
keep default standard behaviour after hook or 1 to disable default
standard behaviour.
 2014-04-16 00:06:16 +02:00
Benjamin
c87515d3a1 Add 2 lang variables for new tab in adherent 
Added MembersStatisticsByRegion and MembersByRegion
 2014-04-14 11:18:14 +02:00
Florian Henry
0d1697589e syntax 2014-04-13 20:39:40 +02:00
Florian Henry
7d84c573ab syntax travis ruleset.xml 2014-04-13 18:57:35 +02:00
Florian Henry
57e4453ea2 Add filter date and total line on bank writing list page 2014-04-13 18:26:21 +02:00
Laurent Destailleur
38a0596594 Merge branch 'develop' of https://github.com/aspangaro/dolibarr into 
aspangaro-develop

Conflicts:
	htdocs/core/lib/bank.lib.php
 2014-04-13 02:11:54 +02:00
Laurent Destailleur
9fb029890c Doxygen 2014-04-13 02:08:57 +02:00
Laurent Destailleur
87f7771af2 Merge pull request #1532 from defrance69/patch-5 
Update product.class.php
 2014-04-13 02:06:04 +02:00
Laurent Destailleur
0bda82e707 Merge pull request #1524 from FHenry/develop 
Fix choix date in survey
 2014-04-13 02:04:34 +02:00
Laurent Destailleur
5d30220bf1 Merge pull request #1530 from squarou/develop 
Add region tab for stats in adhrent
 2014-04-13 02:04:02 +02:00
Laurent Destailleur
55c2659952 Fix: sql syntax error 2014-04-13 02:02:26 +02:00
Laurent Destailleur
31fa6c5b2b Merge branch 'develop' of https://github.com/guerrierk/dolibarr into 
guerrierk-develop

Conflicts:
	htdocs/commande/fiche.php
 2014-04-13 01:59:46 +02:00
BENKE Charles
32090eeeb5 Update product.class.php 
init the stock_warehouse Array during fetch instead we omit to load the stock (wrong value stay inside)
 2014-04-12 11:41:32 +02:00
aspangaro
79d8ce9d1d Add tabs in bank card 2014-04-12 10:00:28 +02:00
aspangaro
bae2fe0921 Merge branch 'upstream/develop' 2014-04-12 09:51:19 +02:00
Laurent Destailleur
81ff0a8643 Fix: Missing initialized value 2014-04-12 01:45:18 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
918de2d0a1 Fix: Payment detail are not visible. 2014-04-11 19:20:11 +02:00
Laurent Destailleur
5843668dbe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-04-11 19:02:59 +02:00
Laurent Destailleur
417a1232ef Uniformize usage of function price 2014-04-11 18:00:58 +02:00
Juanjo Menent
f458c384d7 Fix: Can not make withdrawals 
Conflicts:
	ChangeLog
 2014-04-11 12:10:04 +02:00
Juanjo Menent
75e76dc232 Fix: Can not make withdrawals 2014-04-11 12:07:01 +02:00
squarou
a0b05581f9 Added region tab 2014-04-10 22:15:56 +02:00
squarou
247b14afac Add region stats and tab 
Added ($mode == 'memberbystate')
 2014-04-10 22:13:59 +02:00
Laurent Destailleur
55599f9455 Fix: MAIN_AUTOFILL_DATE was broken in some cases. 2014-04-10 19:47:52 +02:00
Laurent Destailleur
7fcf57ca5a Fix: SQL request for export. Extra field missing. 2014-04-10 18:36:34 +02:00
Laurent Destailleur
4be113b2e8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-04-10 17:55:14 +02:00