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

31192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
e16b1067cd Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/core/ajax/extraparams.php
 2012-03-17 09:47:56 +01:00
Regis Houssin
181fac1d9d Fix: End of line character is invalid; expected "\n" but found "\r\n" 2012-03-17 09:45:14 +01:00
Regis Houssin
938d0beccf Fix: End of line character is invalid; expected "\n" but found "\r\n" 2012-03-17 09:30:49 +01:00
Regis Houssin
5e43b326fe Try to avoid phpunit error 2012-03-17 09:08:54 +01:00
Regis Houssin
da4a29462e Fix: php unit test error 2012-03-17 08:50:09 +01:00
Regis Houssin
e84c77ba31 New: add template for infos and contacts tabs and show/hide bloc system 2012-03-16 22:02:14 +01:00
Regis Houssin
60a6c3fa95 Fix: missing fetch for get extraparams 2012-03-16 19:16:17 +01:00
Regis Houssin
81a97edf9c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 18:37:16 +01:00
Regis Houssin
205f884ec0 Fix: try to use div title with show/hide effect 2012-03-16 18:36:32 +01:00
Laurent Destailleur
826a5f80e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-03-16 18:36:03 +01:00
Laurent Destailleur
aa195b9ecf New: Add web service to list product. Not stable yet. 2012-03-16 18:35:39 +01:00
Regis Houssin
8ab71288a6 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 17:40:41 +01:00
Regis Houssin
ccf1665837 Fix: missing status after set draft 2012-03-16 17:37:18 +01:00
Regis Houssin
5de859d14b Fix: missing colspan if view line number is active 2012-03-16 17:26:19 +01:00
Regis Houssin
fb38bba794 Merge pull request #133 from simnandez/develop 
Trad: Add ca_ES and es_ES missing translations
 2012-03-16 09:01:27 -07:00
Regis Houssin
b862b37731 New: update CKEditor to 3.6.2 2012-03-16 16:56:18 +01:00
simnandez
017701b3f1 Trad: Add ca_ES and es_ES missing translations 2012-03-16 16:33:27 +01:00
Regis Houssin
09e6867029 New: add view/edit notes in "deplacement" and "fichinter" cards 2012-03-16 16:01:45 +01:00
Regis Houssin
77de410491 Fix: doxygen 2012-03-16 14:41:22 +01:00
Regis Houssin
5a0ee19a0b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 14:33:03 +01:00
Regis Houssin
391ce8490f New: add "extraparams" field for stock extra parameters with json 2012-03-16 14:32:37 +01:00
Laurent Destailleur
e27bdac81a Fix: Restore correct name of field. 2012-03-16 13:27:03 +01:00
Laurent Destailleur
a0f6d5824d Fix: Better warning message. To lock install, recommanded solution is having an install.lock file, not deleting directory. 2012-03-16 11:23:53 +01:00
Regis Houssin
1622a86d71 New: possibility to view/edit notes in invoice card 2012-03-16 11:12:59 +01:00
Laurent Destailleur
7e69c79a29 Comments 2012-03-16 11:08:04 +01:00
Regis Houssin
0df083a8d8 Fix: update security 2012-03-16 10:55:29 +01:00
Regis Houssin
88d5cbc678 New: possibility to view/edit notes in order card 2012-03-16 09:46:21 +01:00
Regis Houssin
ae54a229fb Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 09:39:45 +01:00
Regis Houssin
dae20441d0 Fix: add template for view/edit notes in object card and add possibility 
to show/hide this bloc
 2012-03-16 09:39:32 +01:00
Laurent Destailleur
6ae4292563 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-16 09:36:21 +01:00
Laurent Destailleur
46d08a9d3b Doxygen 2012-03-16 09:35:59 +01:00
Laurent Destailleur
6e864bc992 Doxygen 2012-03-16 09:34:19 +01:00
Regis Houssin
3b9b988e62 Merge pull request #132 from simnandez/develop 
Fix: Bad departement name
 2012-03-16 01:21:54 -07:00
simnandez
00474e119f Fix: Bad departement name 2012-03-16 09:15:29 +01:00
Laurent Destailleur
245edb8596 Fix: Maxi debug on sending document by email. Works now with odt too. 2012-03-16 00:34:41 +01:00
Laurent Destailleur
bc94ec9cd6 Fix: We allow to add credit not higher than invoice amount. 2012-03-15 22:51:02 +01:00
Laurent Destailleur
1f0cddc464 Add hidden option to allow negative invoices (for test purpose only, 
negative invoices should be done using credit note).
 2012-03-15 22:38:55 +01:00
Laurent Destailleur
5f8fc30121 Fix: Avoid duplicate hooks 2012-03-15 22:37:42 +01:00
Laurent Destailleur
d60bb77fea Save one click when using backup/restore. 2012-03-15 20:45:08 +01:00
Laurent Destailleur
cd036aa8ae Fix: pgsql compatibility 2012-03-15 20:00:11 +01:00
Regis Houssin
e8ec5f5ad7 New: add vat rate in supplier price 
New: add events system in jquery combobox
 2012-03-15 16:52:18 +01:00
Regis Houssin
d296f17f36 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-15 16:02:43 +01:00
Laurent Destailleur
62801532a7 Add a protection for duplicate modules 2012-03-15 16:01:56 +01:00
Laurent Destailleur
5edcc19820 Add a protection for duplicate modules 2012-03-15 15:47:01 +01:00
Regis Houssin
704d7de02a New: add load_cache_vatrates() method 2012-03-15 11:01:29 +01:00
Regis Houssin
993b5eefaf Fix: wrong blank space for jquery combobox 
Fix: uniformize code
 2012-03-15 10:14:54 +01:00
Laurent Destailleur
62e0814041 Fix: Removed not standard/compatible SQL. External module should not 
have foreign keys with standard tables. This creates
dependencies and instabilities of core code. Integrity must be checked
by applications for external modules, not by database.
 2012-03-15 09:46:44 +01:00
Laurent Destailleur
3a8885eea6 Fix: If a project must be linked to any companies (suppliers or not), 
project must be not be set as limited to customer but must be not linked
to any particular thirdparty
 2012-03-15 09:36:39 +01:00
Laurent Destailleur
25257ee873 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-03-15 09:26:50 +01:00
Laurent Destailleur
d76802630a Doxygen 2012-03-15 09:26:14 +01:00