Laurent Destailleur
|
724817b966
|
Merge pull request #4259 from aschio/develop_sunimport
Adding extrafields to shipments module
|
2015-12-18 17:28:35 +01:00 |
|
Laurent Destailleur
|
dc8e5f45ae
|
Merge pull request #4254 from grandoc/develop
[Qual] Uniformize code
|
2015-12-18 17:13:22 +01:00 |
|
phf
|
c215898c52
|
FIX label of line is set in description field if empty
|
2015-12-18 17:11:14 +01:00 |
|
Laurent Destailleur
|
7af4d91828
|
Merge pull request #4251 from fmarcet/3.6
FIX: Not deleting contracts on element_element table
|
2015-12-18 17:07:42 +01:00 |
|
Laurent Destailleur
|
c328860af0
|
Merge pull request #4250 from GPCsolutions/dolibarr-4242
FIX #4242 Allow disabling dashes in documents
|
2015-12-18 17:07:00 +01:00 |
|
Laurent Destailleur
|
452feca64a
|
Merge pull request #4249 from GPCsolutions/3.8-4242
FIX #4242 Allow disabling dashes in documents
|
2015-12-18 17:06:51 +01:00 |
|
Laurent Destailleur
|
2a137cd126
|
Merge pull request #4248 from GPCsolutions/3.7-4242
FIX #4242 Allow disabling dashes in documents
|
2015-12-18 17:06:40 +01:00 |
|
Laurent Destailleur
|
3d6f1d911a
|
Merge pull request #4247 from GPCsolutions/3.6-4242
FIX #4242 Allow disabling dashes in documents
|
2015-12-18 17:06:23 +01:00 |
|
Laurent Destailleur
|
74293cd7cc
|
git push origin developMerge branch 'GPCsolutions-dolibarr-cifix' into develop
|
2015-12-18 17:05:19 +01:00 |
|
Laurent Destailleur
|
d0ec3f1152
|
Merge branch 'dolibarr-cifix' of
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-dolibarr-cifix
Conflicts:
htdocs/product/card.php
|
2015-12-18 17:05:04 +01:00 |
|
Regis Houssin
|
70354def7c
|
Fix: Disable "main.inc.php" hooks with ajax return
|
2015-12-18 13:27:51 +01:00 |
|
Laurent Destailleur
|
98cd4f8307
|
Fix message so it is more clear what the feature can do or not.
Fix list of email templates must be hidden for templates of disabled
modules.
|
2015-12-18 12:48:20 +01:00 |
|
cla
|
cb96618460
|
Merge branch 'develop' into develop_sunimport
|
2015-12-18 10:49:57 +01:00 |
|
fappels
|
4fcedc92c9
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop
|
2015-12-18 10:29:53 +01:00 |
|
BENKE Charlie
|
dc0af179e9
|
add icalname on default event
allow to manipulate it (show/hide) when we add some other calendar on main (eg fichinter calendar)
|
2015-12-18 01:41:30 +01:00 |
|
Raphaël Doursenaud
|
b446aef192
|
FIX #3868 Upgraded ckeditor to 4.5.6
|
2015-12-17 22:44:47 +01:00 |
|
Raphaël Doursenaud
|
fd2b90ac75
|
[Qual] Added development tools to composer
|
2015-12-17 22:44:41 +01:00 |
|
Laurent Destailleur
|
b10f9d4ca3
|
Fix: when doing an export of extrafields, we must use different table
alias for each extrafield table.
|
2015-12-17 20:40:33 +01:00 |
|
Laurent Destailleur
|
5eea1ce7d9
|
Fix several warnings
|
2015-12-17 19:37:24 +01:00 |
|
philippe grand
|
6e45ad92fa
|
fix some issue within setEventMessages attribut
|
2015-12-17 17:35:30 +01:00 |
|
philippe grand
|
b91031b693
|
fix some issue within my last commit
|
2015-12-17 17:20:28 +01:00 |
|
Laurent Destailleur
|
5f4947e3c1
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-12-17 17:16:37 +01:00 |
|
Laurent Destailleur
|
cdc408a84c
|
Fix: button "now" was not working on date using no javascript
|
2015-12-17 17:16:26 +01:00 |
|
philippe grand
|
367d9de0b7
|
fix some translation
|
2015-12-17 17:12:28 +01:00 |
|
philippe grand
|
93845ffa69
|
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
|
2015-12-17 16:58:05 +01:00 |
|
philippe grand
|
c9d6607b04
|
[Qual] Uniformize code
|
2015-12-17 14:14:44 +01:00 |
|
Laurent Destailleur
|
92343901d6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-17 14:01:34 +01:00 |
|
Laurent Destailleur
|
ba3c8de785
|
Update doc comment to make things cleaner to avoid confusion between old
deprecated doActions of canvas and doActions of triggers.
|
2015-12-17 14:01:22 +01:00 |
|
aspangaro
|
ea73e0253c
|
Move fiscal year from accountancy module to configuration of Dolibarr
|
2015-12-17 13:09:46 +01:00 |
|
aspangaro
|
85f87d45df
|
Add select account in product card
|
2015-12-17 12:57:08 +01:00 |
|
fmarcet
|
21f7271e51
|
FIX: Not deleting contrats on element_element table
|
2015-12-17 12:36:43 +01:00 |
|
Raphaël Doursenaud
|
4f9ab7da24
|
FIX #4242 Allow disabling dashes in documents
3.9 specific fix since document have moved
|
2015-12-17 10:39:55 +01:00 |
|
Raphaël Doursenaud
|
7e98cfd5b6
|
FIX #4242 Allow disabling dashes in documents
3.8 specific fix for new documents
|
2015-12-17 10:33:17 +01:00 |
|
Raphaël Doursenaud
|
02e053acc6
|
FIX #4242 Allow disabling dashes in documents
3.7 specific fix since document files have moved
|
2015-12-17 10:26:27 +01:00 |
|
Raphaël Doursenaud
|
e6ec797af8
|
FIX #4242 Allow disabling dashes in documents
|
2015-12-17 10:21:44 +01:00 |
|
Raphaël Doursenaud
|
c2642acdba
|
Fix CI build 578 (Syntax error)
empty() only supports variables in PHP < 5.5
|
2015-12-17 10:03:42 +01:00 |
|
aspangaro
|
c34e698d59
|
Merge remote-tracking branch 'Upstream/develop' into develop-a4
|
2015-12-17 06:17:32 +01:00 |
|
aspangaro
|
b064d1106b
|
Accountancy Add a list to select accounting account on product card
|
2015-12-17 06:16:29 +01:00 |
|
Laurent Destailleur
|
34f4e913d4
|
Merge pull request #4240 from frederic34/patch-9
Fix when PRODUIT_MULTIPRICES is set, label for each level was not visible
|
2015-12-16 19:58:48 +01:00 |
|
Laurent Destailleur
|
9973315a07
|
Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
|
2015-12-16 19:38:40 +01:00 |
|
Laurent Destailleur
|
6133298e58
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-12-16 19:27:23 +01:00 |
|
Laurent Destailleur
|
f87ccc97e2
|
Miscellaneous fixes
|
2015-12-16 19:26:50 +01:00 |
|
Laurent Destailleur
|
33ea5c83b7
|
Merge pull request #4238 from fappels/develop
Fix product list page offset calculation
|
2015-12-16 19:26:32 +01:00 |
|
Laurent Destailleur
|
acc4623b74
|
Merge pull request #4236 from defrance/patch-90
fix ErrorBadValueForParamNotAString shit one again...
|
2015-12-16 19:25:39 +01:00 |
|
Laurent Destailleur
|
609b8a8506
|
Merge pull request #4234 from aspangaro/develop-a3
Accountancy- Add a column in table bookkeeping to validate operations
|
2015-12-16 19:15:13 +01:00 |
|
Laurent Destailleur
|
7c1fc2fee1
|
Merge pull request #4233 from aspangaro/3.7-accountancy1
Fix: Accountancy Add an empty field for list of parent account - This value can be null
|
2015-12-16 19:14:45 +01:00 |
|
Laurent Destailleur
|
516e071363
|
Merge pull request #4232 from aspangaro/develop-remove_zero
New: Accountancy add a function to remove all zero at the right of the account
|
2015-12-16 19:13:43 +01:00 |
|
Laurent Destailleur
|
710a8bb6a9
|
Merge pull request #4231 from mrsof/patch-2
Typo
|
2015-12-16 19:11:24 +01:00 |
|
Laurent Destailleur
|
1435a3eec7
|
Merge pull request #4226 from defrance/patch-88
Fix add missing translations for export feature
|
2015-12-16 19:11:07 +01:00 |
|
Laurent Destailleur
|
c03320ff0b
|
Merge pull request #4224 from aspangaro/develop-fec
Complete information on FEC format - french law
|
2015-12-16 19:10:17 +01:00 |
|