lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,000 Commits 43 Branches 150 Tags 886 MiB
a43fcdbb14
Commit Graph

38733 Commits

Author SHA1 Message Date
Laurent Destailleur
7c5927ef93 Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1796

Conflicts:
	ChangeLog
 2015-01-18 15:08:49 +01:00
Laurent Destailleur
b3e216b8f1 Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
 2015-01-18 15:06:54 +01:00
Laurent Destailleur
c35de1aa06 Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1803

Conflicts:
	ChangeLog
 2015-01-18 15:01:18 +01:00
Laurent Destailleur
cef48d1275 Merge branch 'bug-1804' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1804

Conflicts:
	ChangeLog
 2015-01-18 14:02:52 +01:00
Laurent Destailleur
cf3a8f5a71 Merge pull request #2245 from KreizIT/fix_defaultE37 
Fix Creating default object from empty on supplier order confirmation
 2015-01-18 14:01:57 +01:00
Laurent Destailleur
0513ce25e5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2015-01-18 13:51:45 +01:00
Laurent Destailleur
8644407c0a Merge pull request #2230 from defrance69/patch-42 
Update card.php
 2015-01-18 13:44:35 +01:00
Laurent Destailleur
05f08a7181 Merge branch 'bug-1762' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1762

Conflicts:
	ChangeLog
 2015-01-18 13:43:57 +01:00
frederic34
d45750d914 Ignore content of directory custom 
Conflicts:
	htdocs/custom/.gitignore
 2015-01-18 13:07:39 +01:00
Laurent Destailleur
b1f889e1d1 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-01-18 12:46:23 +01:00
Laurent Destailleur
2f4352c759 Merge branch 'bug-1785' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1785

Conflicts:
	ChangeLog
 2015-01-18 12:45:05 +01:00
Laurent Destailleur
19dbf7e2c6 Merge pull request #2185 from marcosgdf/bug-1765 
Fix: [ bug #1765 ] Unable to create a contract
 2015-01-18 12:39:25 +01:00
Laurent Destailleur
4639ce3364 Merge branch 'bug-1802' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1802

Conflicts:
	ChangeLog
 2015-01-18 12:37:16 +01:00
Laurent Destailleur
ef802d9c39 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2015-01-18 12:31:01 +01:00
Laurent Destailleur
6a294eb02a Fixed: Better fix for backward compatibility 2015-01-18 12:29:55 +01:00
Laurent Destailleur
012c571a6c Fixed: Backward compatibility 2015-01-18 11:50:53 +01:00
Marcos García de La Fuente
be3527abd1 Fixed some errors of Bookkeeping class 2015-01-18 03:23:00 +01:00
Marcos García de La Fuente
71e5cf07c6 Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes 2015-01-18 03:12:46 +01:00
Marcos García de La Fuente
78905c6af1 Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas 2015-01-17 20:29:51 +01:00
Marcos García de La Fuente
003aa5ee44 Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount 2015-01-17 19:41:31 +01:00
Marcos García de La Fuente
dacec491ff Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON 2015-01-17 19:37:49 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
cc9197e4c8 Fixed problem with Fichinter::getNextNumRef 2015-01-17 19:13:38 +01:00
Marcos García de La Fuente
41e01a22a3 Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code 2015-01-17 18:58:05 +01:00
Marcos García de La Fuente
ed839114ab Fixed loading of external numeration modules in FactureFournisseur and Propal 2015-01-17 18:42:19 +01:00
Marcos García de La Fuente
068045f6a0 Fix: [ bug #1803 ] AJAX company contact input is not aligned 2015-01-17 18:23:20 +01:00
Marcos García de La Fuente
a64084308d Fix: [ bug #1804 ] SQL error when sending email without addresee 2015-01-17 18:12:43 +01:00
Laurent Destailleur
06eda34b56 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-17 16:40:53 +01:00
Laurent Destailleur
9876b30387 Need more info to find bugs 2015-01-17 16:22:37 +01:00
Juanjo Menent
0d4aad4111 Fix: PostgreSQL compatibilty 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-01-16 17:59:58 +01:00
Juanjo Menent
fe5533d1c3 Fix: PostgreSQL compatibilty 2015-01-16 17:41:56 +01:00
Laurent Destailleur
6a900598a3 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-16 15:13:48 +01:00
Laurent Destailleur
41890d0a0b Fixed: Translation of module name and desc was not used for external 
modules.
 2015-01-16 14:38:00 +01:00
Laurent Destailleur
d1a0187f82 Merge pull request #2236 from marcosgdf/translations 
Corrected translation typos
 2015-01-16 12:10:32 +01:00
Laurent Destailleur
767afd3c9f Merge pull request #2231 from KreizIT/fix_cron 
Fix cron
 2015-01-16 12:08:30 +01:00
Laurent Destailleur
6f00cecd81 Merge pull request #2244 from KreizIT/fix_default_empty 
FIX : Creating default object from empty when validating supplier order
 2015-01-16 12:03:23 +01:00
KreizIT
a9008c4993 Fix Creating default object from empty on supplier order confirmation 2015-01-15 17:40:15 +01:00
Cedric
999a6052ff FIX : Creating default object from empty when validating supplier order 2015-01-15 16:23:10 +01:00
Marcos García de La Fuente
61809ef6b5 - Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database 2015-01-15 13:22:58 +01:00
Marcos García de La Fuente
88c3509dd0 Merge remote-tracking branch 'upstream/3.6' into 3.6 
Conflicts:
	ChangeLog
 2015-01-15 13:09:23 +01:00
Marcos García de La Fuente
71b609fab0 Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules 2015-01-15 13:08:33 +01:00
Juanjo Menent
f03ffaf5a3 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:00:52 +01:00
Juanjo Menent
d40eab2494 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.
 2015-01-15 09:57:20 +01:00
Laurent Destailleur
e20c1decdf Fixed: object instead of soc and vis versa. 2015-01-15 03:51:47 +01:00
Laurent Destailleur
c5a3b4481e Fixed: use object 2015-01-15 03:11:06 +01:00
Laurent Destailleur
d16ce7eb96 Fix: Bad var 2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
4d67e6f4d4 Add ignore 2015-01-15 02:11:22 +01:00
Laurent Destailleur
ccfbd3614e Not nice looking 2015-01-15 02:09:28 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00
Laurent Destailleur
68441a563a Fixed: Avoid space into address string 2015-01-14 19:17:58 +01:00
Laurent Destailleur
4c64b8ceae Add menu image 2015-01-14 19:12:22 +01:00
Laurent Destailleur
e3f3956bed Sec: Bad security test 2015-01-14 19:11:56 +01:00
Laurent Destailleur
806477977d Fix: css 2015-01-14 13:51:21 +01:00
Laurent Destailleur
a886136e67 More comment and add a unit test to check that {t} tag is correctly 
supported.
 2015-01-13 22:13:15 +01:00
Marcos García de La Fuente
4da52cf733 Fix: [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date 2015-01-13 11:11:37 +01:00
Marcos García de La Fuente
7b4cf976df Corrected translation typos 2015-01-13 09:42:46 +01:00
Marcos García de La Fuente
85b1188593 Fix: [ bug #1788 ] Duplicated doActions hook in product/fournisseurs.php 2015-01-13 09:22:12 +01:00
Marcos García de La Fuente
6c4702f282 Fix: [ bug #1785 ] Start date is lost in Project > Linked objects 2015-01-13 09:11:04 +01:00
Marcos García de La Fuente
7e16d0c1d3 Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled 2015-01-13 01:48:58 +01:00
Laurent Destailleur
dc0d12eccd Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-12 19:00:29 +01:00
Laurent Destailleur
58e4e01db7 Sync transifex 2015-01-12 18:59:46 +01:00
Laurent Destailleur
31fd03790e Fixed: Prices visible into stock tab. 
Conflicts:
	htdocs/product/stock/product.php
 2015-01-12 18:26:11 +01:00
Cedric
d2cd841573 Fix divide by zero error 2015-01-12 13:23:18 +01:00
Cedric
26cad2400e Fix missing lang key 2015-01-12 13:18:50 +01:00
BENKE Charles
b6b84e235c Update card.php 
hide line with empty duration if FICHINTER_HIDE_EMPTY_DURATION is activate
 2015-01-12 10:16:34 +01:00
Laurent Destailleur
a77a604082 Fix: include custom dir so everybody has it. 2015-01-11 15:32:11 +01:00
Laurent Destailleur
e4b89779f7 Fixed: css conflict 2015-01-10 21:39:40 +01:00
Laurent Destailleur
c441aa89db Fixed: Avoid warning 2015-01-10 18:19:44 +01:00
Laurent Destailleur
90add2fa96 Fix: amarok is a bugged theme making dolidroid failed. We swith to 
eldy automatically with dolidroid.
 2015-01-10 17:23:52 +01:00
Laurent Destailleur
dda12003d4 Fixed: User of creation was not visible. 2015-01-10 12:23:15 +01:00
Laurent Destailleur
30d1284379 Fixed: Missing ref_ext 2015-01-10 01:15:39 +01:00
Laurent Destailleur
87f70f2d22 Fixed: property must be called billed into web service. 
Fixed: web service to create order was useless. it was not possible to
change status.
 2015-01-10 01:07:18 +01:00
Laurent Destailleur
f7960ec104 Fixed: Upgrade are done several times 2015-01-09 23:19:18 +01:00
fentman
9049931ff0 Change to $listofcurrenciesbefore for GBP + AUD 
Update of functions.lib.php - function price()
$listofcurrenciesbefore to include USD, GBP, and AUD to support $ and £ appearing before amounts on invoices not after the amount
 2015-01-09 22:55:17 +01:00
Laurent Destailleur
dbcaeb01c0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
 2015-01-09 22:40:45 +01:00
Laurent Destailleur
32edb33411 Start 3.6.3 2015-01-09 22:32:25 +01:00
Laurent Destailleur
068ae7f0d4 - Fix: ref_ext was not saved when recording a customer order from web 
service
 2015-01-09 22:32:00 +01:00
Laurent Destailleur
f54e90c9cf Better doc to install external modules. 
Custom dir will be installed by default.
 2015-01-09 13:00:10 +01:00
Laurent Destailleur
b220bb7b1d Fixed: Size too low 2015-01-07 11:14:51 +01:00
Laurent Destailleur
f8792bdbc7 Fixed: Add opensurvey into list of reloaded modules for 3.7 2015-01-07 11:11:40 +01:00
Laurent Destailleur
4ee308c77b Fixed: Filter lost after search on date 2015-01-06 20:58:23 +01:00
Laurent Destailleur
2bf2c8fce7 Restore all requets 2015-01-06 00:34:23 +01:00
Laurent Destailleur
033757aafd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-01-06 00:33:28 +01:00
Laurent Destailleur
4ce7a27dca Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-01-06 00:28:07 +01:00
Laurent Destailleur
a668d163fd Repair corrupted data 2015-01-06 00:27:35 +01:00
Laurent Destailleur
b919318b53 Merge pull request #2213 from marcosgdf/opensurvey 
Fixed error deleting survey comment
 2015-01-06 00:21:32 +01:00
Laurent Destailleur
443c9d245e Merge pull request #2212 from marcosgdf/misc-doc 
Miscellaneous corrections
 2015-01-06 00:21:05 +01:00
Laurent Destailleur
908a95d83f Merge pull request #2211 from marcosgdf/contract-fixes 
Several Contract-related fixes
 2015-01-06 00:18:51 +01:00
Laurent Destailleur
3f7aab93e5 Merge pull request #2204 from defrance69/patch-39 
Update facture.php
 2015-01-06 00:14:42 +01:00
Laurent Destailleur
e5f81b1fec Merge pull request #2202 from defrance69/patch-38 
Update facture.php
 2015-01-06 00:13:55 +01:00
Laurent Destailleur
337d055872 Merge pull request #2199 from altatof/3.6 
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
 2015-01-06 00:10:08 +01:00
Laurent Destailleur
561ace5b0c Merge pull request #2219 from ndrosis/patch-11 
Fix Lang for Check Payment Type
 2015-01-06 00:07:38 +01:00
Laurent Destailleur
6a6c5c54f1 Merge pull request #2220 from aspangaro/3.7-Auguria 
Add module accountancy expert in auguria menu
 2015-01-06 00:07:26 +01:00
Laurent Destailleur
256cd68404 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-06 00:04:51 +01:00
Laurent Destailleur
3794c9305e Fix: [ bug #1754 ] Error while installing 3.7 2015-01-06 00:04:23 +01:00
Laurent Destailleur
5032f88e9f Merge pull request #2221 from aspangaro/3.7-Skype 
Skype :: Better presentation
 2015-01-05 23:52:28 +01:00
aspangaro
b4b5b35afa Skype :: Better presentation 2015-01-04 20:17:49 +01:00
Laurent Destailleur
d8d01090cd Fixed: Mark function as deprecated 2015-01-04 19:28:05 +01:00
Laurent Destailleur
48818ed2fd Fixed: Quick solution to solve problem of unknown payment amount for 
online subscription.
 2015-01-04 15:40:01 +01:00